BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
91628170c7ed6d6f9ad0e6a19c6ca8fc69672b1d
Switch branch/tag
gitlab-ce
app
views
projects
merge_requests
conflicts
_file_actions.html.haml
02 Feb, 2017
1 commit
removes old css class from everywhere
· b329a467
Nur Rony
authored
7 years ago
b329a467
31 Dec, 2016
1 commit
HAMLLint: Fix `SpaceInsideHashAttributes` offences
· fb3e3654
Kushal Pandya
authored
7 years ago
fb3e3654
13 Oct, 2016
2 commits
Ability to resolve conflicts for files with `text-editor` as conflict type
· 197ac5eb
Alfredo Sumaran
authored
8 years ago
197ac5eb
Implement editor to manually resolve merge conflicts
· 26f658de
Alfredo Sumaran
authored
8 years ago
26f658de