Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | OAuth2 provider documentation | Valery Sizov | 2015-02-13 | 6 | -1/+33 | |
| |/ / | ||||||
* | | | Merge branch 'test_settings' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 2 | -1/+24 | |
|\ \ \ | ||||||
| * | | | Fix rubocop error. | Marin Jankovski | 2015-02-12 | 1 | -1/+1 | |
| * | | | Try to test settings added in the service. | Marin Jankovski | 2015-02-12 | 2 | -1/+24 | |
* | | | | Merge branch 'add_tracker_integration_doc' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 6 | -6/+49 | |
|\ \ \ \ | ||||||
| * | | | | Text changes recommended by Job. | Marin Jankovski | 2015-02-13 | 1 | -5/+5 | |
| * | | | | Explained in the integration documentation how to enable external issue tracker | Marin Jankovski | 2015-02-12 | 6 | -6/+49 | |
| |/ / / | ||||||
* | | | | Merge branch 'signin-page-headings' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 6 | -30/+32 | |
|\ \ \ \ | ||||||
| * | | | | Move OAuth signin options just below signin box. | Douwe Maan | 2015-02-13 | 5 | -24/+19 | |
| * | | | | Add headings to signin/signup blocks on signin page. | Douwe Maan | 2015-02-13 | 3 | -6/+13 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'dashboard-new-project' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 2 | -3/+9 | |
|\ \ \ \ | ||||||
| * | | | | Add "New Project" button to dashboard projects page. | Douwe Maan | 2015-02-13 | 2 | -3/+9 | |
| |/ / / | ||||||
* | | | | Merge branch 'head-panel-link' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 12 | -10/+13 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | Link head panel titles to relevant root page. | Douwe Maan | 2015-02-13 | 12 | -10/+13 | |
| |/ / | ||||||
* | | | Add assignees in mr page to the CHANGELOG. | Marin Jankovski | 2015-02-13 | 1 | -2/+3 | |
|/ / | ||||||
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-02-12 | 187 | -3563/+3816 | |
|\ \ | ||||||
| * \ | Merge pull request #8785 from jvanbaarsen/rspec-upgrade | Dmitriy Zaporozhets | 2015-02-12 | 187 | -3563/+3816 | |
| |\ \ | ||||||
| | * | | Fixed deprecation in spinach stubs | Jeroen van Baarsen | 2015-02-12 | 1 | -1/+1 | |
| | * | | Even more hound fixes | Jeroen van Baarsen | 2015-02-12 | 16 | -191/+266 | |
| | * | | Fixed tests for spinach | Jeroen van Baarsen | 2015-02-12 | 1 | -1/+1 | |
| | * | | Fixed hound warnings | Jeroen van Baarsen | 2015-02-12 | 6 | -15/+31 | |
| | * | | Updated rspec to rspec 3.x syntax | Jeroen van Baarsen | 2015-02-12 | 183 | -3453/+3610 | |
| | * | | Started on the rspec upgrade | Jeroen van Baarsen | 2015-02-12 | 4 | -16/+21 | |
* | | | | Merge branch 'clean-oauth-username' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 5 | -6/+33 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Clean username acquired from OAuth/LDAP. | Douwe Maan | 2015-02-12 | 5 | -6/+33 | |
* | | | | Merge pull request #8779 from KelvinMutuma/show-assignees-in-merge-requests-i... | Dmitriy Zaporozhets | 2015-02-12 | 1 | -2/+4 | |
|\ \ \ \ | ||||||
| * | | | | Show Work In progress if a merge request is not assigned | Kelvin Mutuma | 2015-02-12 | 1 | -0/+2 | |
| * | | | | Show assignees in the merge-requests index | Kelvin Mutuma | 2015-02-12 | 1 | -2/+2 | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-02-12 | 2 | -4/+17 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Sytse Sijbrandij | 2015-02-12 | 2 | -4/+17 | |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| | * | | | | Merge branch 'master' into 'master' | Dmitriy Zaporozhets | 2015-02-12 | 2 | -4/+17 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Change label color text field type to "color" | Benjamin Kammerl | 2015-02-11 | 1 | -1/+1 | |
| | | * | | | | Reorders label colors for better "rainbow" | phortx | 2015-01-13 | 1 | -8/+8 | |
| | | * | | | | Add more label color suggestions | phortx | 2015-01-13 | 1 | -1/+14 | |
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-02-12 | 34 | -74/+65 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | Merge pull request #8445 from jvanbaarsen/project-spec-speed-up | Jeroen van Baarsen | 2015-02-12 | 2 | -73/+32 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Improved speed of the project_spec.rb | Jeroen van Baarsen | 2015-02-03 | 2 | -73/+32 | |
| * | | | | | | Merge pull request #8739 from jvanbaarsen/pr/7818 | Jeroen van Baarsen | 2015-02-12 | 32 | -1/+33 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | note about latest details being on master branch | Ben Bodenmiller | 2015-02-05 | 32 | -1/+33 | |
* | | | | | | | | Merge branch 'gitattributes-merge-union' into 'master' | Sytse Sijbrandij | 2015-02-12 | 3 | -35/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use gitattribute merge=union to reduce CHANGELOG merge conflicts. | Douwe Maan | 2015-02-12 | 3 | -35/+2 | |
* | | | | | | | | | Merge branch 'issues_tracker_template' into 'master' | Dmitriy Zaporozhets | 2015-02-12 | 35 | -56/+280 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Use the service_name. | Marin Jankovski | 2015-02-12 | 1 | -2/+2 | |
| * | | | | | | | | Add a test for service template. | Marin Jankovski | 2015-02-12 | 1 | -0/+25 | |
| * | | | | | | | | All services can have templates. | Marin Jankovski | 2015-02-12 | 4 | -14/+26 | |
| * | | | | | | | | Remove unecessary icon. | Marin Jankovski | 2015-02-11 | 1 | -1/+0 | |
| * | | | | | | | | Annotate services. Add a link to service template. | Marin Jankovski | 2015-02-11 | 23 | -51/+55 | |
| * | | | | | | | | Add admin services templates. | Marin Jankovski | 2015-02-11 | 9 | -15/+162 | |
| * | | | | | | | | Remove not null constraint on project_id in services. | Marin Jankovski | 2015-02-11 | 3 | -4/+9 | |
| * | | | | | | | | Add template boolean to services. | Marin Jankovski | 2015-02-11 | 3 | -2/+8 |