summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow to store uploads by default on Object Storagedirect-upload-of-uploadsKamil Trzciński2018-04-046-20/+67
* Merge branch 'ide-pending-tab' into 'master'Tim Zallmann2018-04-0423-178/+478
|\
| * Updated components to PascalCasePhil Hughes2018-04-044-10/+13
| * Merge branch 'master' into ide-pending-tabPhil Hughes2018-04-03389-2911/+8500
| |\
| * | fixed karmaPhil Hughes2018-03-282-1/+4
| * | removed file changes that have no changes to make diff easierPhil Hughes2018-03-288-97/+71
| * | refactor ADD_PENDING_TAB to stop multiple state changesPhil Hughes2018-03-283-43/+26
| * | remove italics from tabPhil Hughes2018-03-281-4/+0
| * | fixed issue with spec because store wasn't getting resetPhil Hughes2018-03-281-1/+3
| * | added specsPhil Hughes2018-03-284-16/+229
| * | replace the tab with the review pending tabPhil Hughes2018-03-281-12/+17
| * | stops opening a pending tab if current tab is in review mode alreadyPhil Hughes2018-03-282-3/+11
| * | remove pending tab when opening a file from the left sidebarPhil Hughes2018-03-284-43/+17
| * | remove extra state propertyPhil Hughes2018-03-286-54/+50
| * | fixed eslint inconsistent returnPhil Hughes2018-03-281-2/+3
| * | updated specsPhil Hughes2018-03-2812-30/+40
| * | correctly toggle between tabsPhil Hughes2018-03-284-9/+18
| * | opens the next open tab correctlyPhil Hughes2018-03-286-76/+101
| * | fixed opening next tab being a pending tabPhil Hughes2018-03-282-12/+33
| * | fix closing & reopening pending tabsPhil Hughes2018-03-289-50/+71
| * | toggling viewer mode closes the pending tabPhil Hughes2018-03-285-7/+33
| * | Added pending tabs to IDEPhil Hughes2018-03-2811-203/+209
* | | Merge branch '20394-protected-branches-wildcard' into 'master'Rémy Coutable2018-04-046-6/+21
|\ \ \
| * | | Resolve "Protected branches count is wrong when a wildcard includes several p...Jan2018-04-046-6/+21
|/ / /
* | | Merge branch 'update_code_quality_job' into 'master'Rémy Coutable2018-04-042-25/+8
|\ \ \
| * | | Use standard codequality jobOlivier Gonzalez2018-04-042-25/+8
|/ / /
* | | Merge branch '39880-merge-method-api' into 'master'Rémy Coutable2018-04-045-1/+76
|\ \ \
| * | | Resolve "Allow the configuration of a project's merge method via the API"Jan2018-04-045-1/+76
|/ / /
* | | Merge branch 'dz-improve-app-settings-5' into 'master'Filipa Lacerda2018-04-044-60/+88
|\ \ \
| * | | Move network related app settings to expandable blocksDmitriy Zaporozhets2018-04-044-60/+88
* | | | Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' in...Sean McGivern2018-04-0417-121/+164
|\ \ \ \
| * | | | Use shard name in Git::GitlabProjects instead of shard pathAhmad Sherif2018-04-0317-121/+164
* | | | | Merge branch 'blackst0ne-rails5-rename-sort-methods' into 'master'Sean McGivern2018-04-0422-35/+35
|\ \ \ \ \
| * | | | | [Rails5] Rename `sort` methods to `sort_by_attribute`blackst0ne2018-04-0422-35/+35
|/ / / / /
* | | | | Merge branch 'fj-174-better-ldap-connection-handling' into 'master'Douwe Maan2018-04-0410-31/+156
|\ \ \ \ \
| * | | | | Add better LDAP connection handlingFrancisco Javier López2018-04-0410-31/+156
|/ / / / /
* | | | | Merge branch 'blackst0ne-rails5-update-gemfile-rails5-lock' into 'master'Rémy Coutable2018-04-041-4/+4
|\ \ \ \ \
| * | | | | [Rails5] Update Gemfile.rails5.lock [ci skip]blackst0ne-rails5-update-gemfile-rails5-lockblackst0ne2018-04-041-4/+4
* | | | | | Merge branch 'bvl-handle-missing-attribute-when-updating-username' into 'master'Douwe Maan2018-04-042-1/+12
|\ \ \ \ \ \
| * | | | | | Handle invalid params when trying update_usernameBob Van Landuyt2018-04-042-1/+12
* | | | | | | Merge branch '41224-pipeline-icons' into 'master'Tim Zallmann2018-04-042-5/+8
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Increase dropdown width in pipeline graph & center action icon41224-pipeline-iconsFilipa Lacerda2018-03-292-5/+8
* | | | | | | Merge branch 'dz-improve-app-settings-4' into 'master'Grzegorz Bizon2018-04-0416-202/+297
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove unnecessary section looking in admin settings qaDmitriy Zaporozhets2018-04-031-12/+2
| * | | | | | Explicitly use page context for qa/factory/settings/hashed_storage.rbDmitriy Zaporozhets2018-04-031-2/+2
| * | | | | | Move repository, storage, abuse settings and logging settings to expandable s...Dmitriy Zaporozhets2018-04-0216-202/+307
* | | | | | | Merge branch '5547-backport-gitlab-git-checksum-to-ce' into 'master'Stan Hu2018-04-032-0/+120
|\ \ \ \ \ \ \
| * | | | | | | Backport Gitlab::Git::Checksum to CEDouglas Barbosa Alexandre2018-04-032-0/+120
* | | | | | | | Merge branch 'docs-update_security_products_examples' into 'master'Marcia Ramos2018-04-033-6/+30
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update Security Products examples documentationOlivier Gonzalez2018-04-033-6/+30
|/ / / / / / /