Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Upgrade to Rails 4.1.9 | Vinnie Okada | 2015-02-14 | 265 | -1098/+1374 |
* | Merge branch 'update_omniauth_integration_document' into 'master' | Sytse Sijbrandij | 2015-02-13 | 6 | -81/+168 |
|\ | |||||
| * | Update oauth documenatation with examples for omnibus package and installatio... | Marin Jankovski | 2015-02-13 | 6 | -81/+168 |
* | | Merge branch 'sidebar-tooltips' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 2 | -1/+5 |
|\ \ | |/ |/| | |||||
| * | Show tooltips on collapsed sidebar | Dmitriy Zaporozhets | 2015-02-13 | 2 | -1/+5 |
|/ | |||||
* | Merge branch 'improve_doc' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 5 | -0/+20 |
|\ | |||||
| * | GitLab.com importer: documentation | Valery Sizov | 2015-02-13 | 5 | -0/+20 |
* | | Merge branch 'oauth-password-http' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 17 | -46/+99 |
|\ \ | |||||
| * | | Allow users that signed up via OAuth to set their password in order to use Gi... | Douwe Maan | 2015-02-13 | 17 | -46/+99 |
* | | | Merge branch 'username-namespace-clash' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 3 | -4/+9 |
|\ \ \ | |||||
| * | | | Prevent autogenerated OAuth username to clash with existing namespace. | Douwe Maan | 2015-02-13 | 3 | -4/+9 |
| |/ / | |||||
* | | | Merge branch 'log_doc' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 2 | -0/+101 |
|\ \ \ | |||||
| * | | | log documentation | Valery Sizov | 2015-02-13 | 2 | -0/+101 |
| |/ / | |||||
* | | | Merge branch 'oauth2_doc' into 'master' | Dmitriy Zaporozhets | 2015-02-13 | 6 | -1/+33 |
|\ \ \ | |||||
| * | | | 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 |
| |\ \ \ \ \ |