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
Repository
3e99123095b26988de67a94b0e7a5207c1ef5ae2
Switch branch/tag
gitlab-ce
spec
javascripts
History
Find file
Select Archive Format
Source code
Download zip
Download tar.gz
Download tar.bz2
Download tar
Fix merge conflicts - squashed commit
· 3e991230
...
James Lopez
authored
Jun 03, 2016
# Conflicts: # app/models/project.rb
3e991230
Name
Last commit
Last update
..
behaviors
Loading commit data...
extensions
Loading commit data...
fixtures
Loading commit data...
graphs
Loading commit data...
issue_spec.js.coffee
Loading commit data...
line_highlighter_spec.js.coffee
Loading commit data...
merge_request_spec.js.coffee
Loading commit data...
merge_request_tabs_spec.js.coffee
Loading commit data...
merge_request_widget_spec.js.coffee
Loading commit data...
new_branch_spec.js.coffee
Loading commit data...
notes_spec.js.coffee
Loading commit data...
project_title_spec.js.coffee
Loading commit data...
right_sidebar_spec.js.coffee
Loading commit data...
shortcuts_issuable_spec.js.coffee
Loading commit data...
spec_helper.coffee
Loading commit data...
syntax_highlight_spec.js.coffee
Loading commit data...
zen_mode_spec.js.coffee
Loading commit data...
