summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] Merge branch 'master' into 42568-pipeline-empty-stateFilipa Lacerda2018-04-04182-1341/+3197
|\
| * Revert "Allow CI/CD Jobs being grouped on version strings"Zeger-Jan van de Weg2018-04-041-1/+1
| * Merge branch 'ide-pending-tab' into 'master'Tim Zallmann2018-04-0414-118/+217
| |\
| | * Updated components to PascalCasePhil Hughes2018-04-044-10/+13
| | * Merge branch 'master' into ide-pending-tabPhil Hughes2018-04-03130-794/+2439
| | |\
| | * | fixed karmaPhil Hughes2018-03-281-1/+3
| | * | 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-282-39/+22
| | * | remove italics from tabPhil Hughes2018-03-281-4/+0
| | * | added specsPhil Hughes2018-03-281-10/+16
| | * | 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-283-13/+6
| | * | remove extra state propertyPhil Hughes2018-03-286-54/+50
| | * | fixed eslint inconsistent returnPhil Hughes2018-03-281-2/+3
| | * | updated specsPhil Hughes2018-03-285-6/+6
| | * | 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
| * | | Resolve "Protected branches count is wrong when a wildcard includes several p...Jan2018-04-043-4/+8
| * | | 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-043-15/+35
| |\ \ \ \
| | * | | | Use shard name in Git::GitlabProjects instead of shard pathAhmad Sherif2018-04-033-15/+35
| * | | | | [Rails5] Rename `sort` methods to `sort_by_attribute`blackst0ne2018-04-0419-20/+20
| * | | | | Add better LDAP connection handlingFrancisco Javier López2018-04-041-4/+0
| * | | | | Merge branch 'bvl-handle-missing-attribute-when-updating-username' into 'master'Douwe Maan2018-04-041-1/+5
| |\ \ \ \ \
| | * | | | | Handle invalid params when trying update_usernameBob Van Landuyt2018-04-041-1/+5
| * | | | | | Merge branch '41224-pipeline-icons' into 'master'Tim Zallmann2018-04-041-5/+3
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Increase dropdown width in pipeline graph & center action icon41224-pipeline-iconsFilipa Lacerda2018-03-291-5/+3
| * | | | | | Merge branch 'dz-improve-app-settings-4' into 'master'Grzegorz Bizon2018-04-046-153/+212
| |\ \ \ \ \ \
| | * | | | | | Move repository, storage, abuse settings and logging settings to expandable s...Dmitriy Zaporozhets2018-04-026-153/+212
| * | | | | | | Refactor discussions/notes codeJan Provaznik2018-04-0317-54/+73
| * | | | | | | Merge branch '44861-mark-gitaly-nplus-one-again' into 'master'Rémy Coutable2018-04-031-3/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Re-enable allowing n+1 Gitaly calls for cold cache44861-mark-gitaly-nplus-one-againLin Jen-Shin2018-04-031-3/+7
| | |/ / / / / /
| * | | | | | | Merge branch 'fix/sm/fix-wrong-error-handling-in-update-page-service' into 'm...Kamil Trzciński2018-04-031-8/+11
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | missing the public folder is InvaildStateErrorfix/sm/fix-wrong-error-handling-in-update-page-serviceShinya Maeda2018-03-301-1/+2
| | * | | | | | Fix bad namingShinya Maeda2018-03-301-2/+2
| | * | | | | | Fix wrong error handling in update page serviceShinya Maeda2018-03-301-7/+9
| | | |/ / / / | | |/| | | |
| * | | | | | Fix body of email when commits are pushed to an MRSean McGivern2018-04-033-3/+4
| | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'dm-gitlab-http-blocked-url-error' into 'master'Robert Speicher2018-04-023-4/+10
| |\ \ \ \ \
| | * | | | | Rename allow_private_networks to allow_local_networkDouwe Maan2018-04-021-5/+3
| | * | | | | Added rescue to show a custom error when testing project integrationsFrancisco Javier López2018-04-021-0/+2
| | * | | | | Raise more descriptive errors when URLs are blockedDouwe Maan2018-04-022-3/+9
| * | | | | | Resolve "Clicking confidential and lock icons on sidebar should also activate...Dennis Tang2018-04-026-162/+216
| * | | | | | Merge branch 'dz-type-button' into 'master'Filipa Lacerda2018-04-027-14/+14
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add button type to settings toggledz-type-buttonDmitriy Zaporozhets2018-04-027-14/+14
| | | |/ / / | | |/| | |