summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Revert "Allow CI/CD Jobs being grouped on version strings"Zeger-Jan van de Weg2018-04-041-3/+1
* Merge branch 'ide-pending-tab' into 'master'Tim Zallmann2018-04-049-60/+261
|\
| * Merge branch 'master' into ide-pending-tabPhil Hughes2018-04-03115-1449/+4099
| |\
| * | fixed karmaPhil Hughes2018-03-281-0/+1
| * | refactor ADD_PENDING_TAB to stop multiple state changesPhil Hughes2018-03-281-4/+4
| * | fixed issue with spec because store wasn't getting resetPhil Hughes2018-03-281-1/+3
| * | added specsPhil Hughes2018-03-283-6/+213
| * | remove pending tab when opening a file from the left sidebarPhil Hughes2018-03-281-30/+11
| * | updated specsPhil Hughes2018-03-287-24/+34
* | | Resolve "Protected branches count is wrong when a wildcard includes several p...Jan2018-04-042-2/+8
* | | Resolve "Allow the configuration of a project's merge method via the API"Jan2018-04-041-1/+40
* | | Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' in...Sean McGivern2018-04-048-59/+85
|\ \ \
| * | | Use shard name in Git::GitlabProjects instead of shard pathAhmad Sherif2018-04-038-59/+85
* | | | [Rails5] Rename `sort` methods to `sort_by_attribute`blackst0ne2018-04-043-15/+15
* | | | Add better LDAP connection handlingFrancisco Javier López2018-04-044-19/+104
* | | | Merge branch 'bvl-handle-missing-attribute-when-updating-username' into 'master'Douwe Maan2018-04-041-0/+7
|\ \ \ \
| * | | | Handle invalid params when trying update_usernameBob Van Landuyt2018-04-041-0/+7
* | | | | Backport Gitlab::Git::Checksum to CEDouglas Barbosa Alexandre2018-04-031-0/+38
* | | | | Merge branch '43745-store-metadata-checksum-for-artifacts' into 'master'Kamil Trzciński2018-04-031-1/+5
|\ \ \ \ \
| * | | | | Store metadata checksum for artifacts43745-store-metadata-checksum-for-artifactsShinya Maeda2018-04-031-1/+5
* | | | | | Refactor discussions/notes codeJan Provaznik2018-04-036-56/+88
* | | | | | Merge branch '44861-mark-gitaly-nplus-one-again' into 'master'Rémy Coutable2018-04-031-1/+17
|\ \ \ \ \ \
| * | | | | | Re-enable allowing n+1 Gitaly calls for cold cache44861-mark-gitaly-nplus-one-againLin Jen-Shin2018-04-031-1/+17
* | | | | | | Merge branch 'fix/sm/fix-wrong-error-handling-in-update-page-service' into 'm...Kamil Trzciński2018-04-031-3/+37
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | missing the public folder is InvaildStateErrorfix/sm/fix-wrong-error-handling-in-update-page-serviceShinya Maeda2018-03-301-5/+8
| * | | | | | Fix wrong error handling in update page serviceShinya Maeda2018-03-301-2/+33
* | | | | | | Merge branch 'rs-performance-bar-for-admins' into 'master'Rémy Coutable2018-04-031-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Always allow the performance bar to be enabled for adminsrs-performance-bar-for-adminsRobert Speicher2018-04-021-0/+6
* | | | | | | | Replace the `project/issues/labels.feature` spinach test with an rspec analogblackst0ne2018-04-034-0/+188
* | | | | | | | Fix body of email when commits are pushed to an MRSean McGivern2018-04-031-0/+30
* | | | | | | | Replace the `project/issues/issues.feature` spinach test with an rspec analogblackst0ne2018-04-0319-103/+526
* | | | | | | | Merge branch 'sh-move-sidekiq-exporter-logs' into 'master'Sean McGivern2018-04-031-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Move Sidekiq exporter logs to log/sidekiq_exporter.logsh-move-sidekiq-exporter-logsStan Hu2018-04-021-1/+3
* | | | | | | | Merge branch 'backport-os-worker-specs' into 'master'Sean McGivern2018-04-032-0/+265
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | backport missing object storage worker specsbackport-os-worker-specsMicaël Bergeron2018-04-022-0/+265
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'dm-gitlab-http-blocked-url-error' into 'master'Robert Speicher2018-04-024-13/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Rename allow_private_networks to allow_local_networkDouwe Maan2018-04-021-6/+6
| * | | | | | Make error messages even more descriptiveDouwe Maan2018-04-022-4/+4
| * | | | | | Raise more descriptive errors when URLs are blockedDouwe Maan2018-04-021-3/+3
* | | | | | | Resolve "Clicking confidential and lock icons on sidebar should also activate...Dennis Tang2018-04-024-1/+81
|/ / / / / /
* | | | | | Merge branch 'fl-prettier-mock-data' into 'master'Clement Ho2018-04-027-882/+961
|\ \ \ \ \ \
| * | | | | | Removes eslint disabled commentsfl-prettier-mock-dataFilipa Lacerda2018-03-297-882/+961
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'sh-cleanup-crlf-gitmodules' into 'master'Douwe Maan2018-04-021-1/+2
|\ \ \ \ \ \
| * | | | | | Handle CR-LFs properly in .gitmodules filesh-cleanup-crlf-gitmodulesStan Hu2018-03-301-1/+2
* | | | | | | Merge branch 'ce-jej/settings-for-saml-sso-per-group' into 'master'Sean McGivern2018-04-022-0/+17
|\ \ \ \ \ \ \
| * | | | | | | Adds validators and rack cookie helperJames Edwards-Jones2018-04-022-0/+17
| | |_|_|/ / / | |/| | | | |
* | | | | | | fix the rake task from being to strict about GroupMicaël Bergeron2018-04-021-7/+108
|/ / / / / /
* | | | | | Merge branch 'dz-improve-app-settings-3' into 'master'Filipa Lacerda2018-04-021-23/+47
|\ \ \ \ \ \
| * | | | | | Move background jobs, spam and performance bar app settings to expandable sec...dz-improve-app-settings-3Dmitriy Zaporozhets2018-03-291-23/+47
* | | | | | | Merge branch 'feature/gb/variables-expressions-in-only-except' into 'master'Kamil Trzciński2018-04-0212-55/+348
|\ \ \ \ \ \ \
View Lorry Controller Status