summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix omniauth-google-oauth2 dependencies in Gemfile.lock32653-fix-gemfile-lockRémy Coutable2017-05-301-4/+3
* Merge branch '30117-update-looks-job-log' into 'master'Phil Hughes2017-05-3010-483/+480
|\
| * Update looks job logFilipa Lacerda2017-05-3010-483/+480
|/
* Merge branch '31349-pipeline-url-techdeb' into 'master'Phil Hughes2017-05-304-58/+67
|\
| * Use vue file for pipelines tables components31349-pipeline-url-techdebFilipa Lacerda2017-05-294-58/+67
* | Merge branch 'fix-authorized-members-destroy' into 'master'Rémy Coutable2017-05-301-1/+1
|\ \
| * | Fix spec for Members::AuthorizedDestroyServicefix-authorized-members-destroyYorick Peterse2017-05-301-1/+1
* | | Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' i...Phil Hughes2017-05-307-7/+123
|\ \ \
| * | | Fix rubocop2472-assignee-dropdown-does-not-display-selected-assignee-ceClement Ho2017-05-261-3/+1
| * | | Backport MR from EEClement Ho2017-05-269-8/+140
* | | | Merge branch '31849-pipeline-show-view-realtime' into 'master'Phil Hughes2017-05-3010-106/+144
|\ \ \ \
| * | | | Use function to define data instead of an object31849-pipeline-show-view-realtimeFilipa Lacerda2017-05-262-4/+6
| * | | | Creates a mediator for pipeline details vue in order to mount several vue app...Filipa Lacerda2017-05-2610-106/+142
* | | | | Merge branch '31616-add-uptime-of-gitlab-instance-in-admin-area' into 'master'Rémy Coutable2017-05-304-0/+13
|\ \ \ \ \
| * | | | | 31616-add-uptime-of-gitlab-instance-in-admin-areajboltz882017-05-294-0/+13
* | | | | | Merge branch '32954-loading-icon' into 'master'Phil Hughes2017-05-302-0/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Displays loading icon in async buttons inline32954-loading-iconFilipa Lacerda2017-05-262-0/+8
* | | | | | Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master'Kamil Trzciński2017-05-295-8/+41
|\ \ \ \ \ \
| * | | | | | Use if pipeline_schedule.refShinya Maeda2017-05-291-1/+1
| * | | | | | Use nil? for ref evaluationShinya Maeda2017-05-291-1/+1
| * | | | | | Add a test for deletion of importing_or_inactive?Shinya Maeda2017-05-291-0/+8
| * | | | | | NULL to nilShinya Maeda2017-05-291-2/+2
| * | | | | | Validate parameters when active is falseShinya Maeda2017-05-291-7/+3
| * | | | | | Add changelogShinya Maeda2017-05-291-0/+4
| * | | | | | FixedShinya Maeda2017-05-291-1/+2
| * | | | | | Reproduced2Shinya Maeda2017-05-291-0/+24
| * | | | | | Revert "Reproduced"Shinya Maeda2017-05-292-26/+1
| * | | | | | ReproducedShinya Maeda2017-05-292-1/+26
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '32677-migrations-using-update_column_in_batches-must-have-a-spe...Robert Speicher2017-05-2915-11/+151
|\ \ \ \ \ \
| * | | | | | Disable Migration/UpdateColumnInBatches for old migrations32677-migrations-using-update_column_in_batches-must-have-a-specRémy Coutable2017-05-2911-9/+10
| * | | | | | New Migration/UpdateColumnInBatches copRémy Coutable2017-05-294-2/+141
* | | | | | | Merge branch '30917-wiki-is-not-searchable-with-guest-permissions' into 'master'Douwe Maan2017-05-296-46/+83
|\ \ \ \ \ \ \
| * | | | | | | Create a separate helper to check if we show particular tab on a search page30917-wiki-is-not-searchable-with-guest-permissionsValery Sizov2017-05-293-21/+32
| * | | | | | | Explicitly test that guest is able to search through the wikiValery Sizov2017-05-294-4/+10
| * | | | | | | update changelogValery Sizov2017-05-221-0/+4
| * | | | | | | Fix: Wiki is not searchable with Guest permissionsValery Sizov2017-05-223-36/+52
* | | | | | | | Merge branch 'sh-fix-submodules-trailing-spaces' into 'master'Robert Speicher2017-05-293-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Strip trailing whitespaces in submodule URLssh-fix-submodules-trailing-spacesStan Hu2017-05-293-0/+10
* | | | | | | | | Merge branch '23036-replace-all-spinach-tests-with-rspec-feature-tests' into ...Rémy Coutable2017-05-293-13/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace 'starred_projects.feature' spinach test with an rspec analog23036-replace-all-spinach-tests-with-rspec-feature-testsblackst0ne2017-05-283-13/+17
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'feature/gb/qa/switch-to-headless-chrome-via-selenium-webdriver'...Rémy Coutable2017-05-295-23/+48
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Dockerize headless chrome browser for GitLab QAfeature/gb/qa/switch-to-headless-chrome-via-selenium-webdriverGrzegorz Bizon2017-05-252-5/+20
| * | | | | | | | | Use headless chrome instead of webkit via QtWebkitGrzegorz Bizon2017-05-254-19/+29
* | | | | | | | | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-2963-472/+1198
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added CHANGELOG entry for nested groups changesrework-authorizations-performance-mysqlrework-authorizations-performanceYorick Peterse2017-05-171-0/+6
| * | | | | | | | | | Document nested groups not working on MySQLYorick Peterse2017-05-171-0/+9
| * | | | | | | | | | Index project_group_links.group_idYorick Peterse2017-05-172-0/+21
| * | | | | | | | | | Convert nested groups to regular ones for MySQLYorick Peterse2017-05-172-0/+189
| * | | | | | | | | | Hide nested group UI/API support for MySQLYorick Peterse2017-05-1712-17/+33
| * | | | | | | | | | Use CTEs for nested groups and authorizationsYorick Peterse2017-05-1751-464/+949
View Lorry Controller Status