summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Web IDE markdown previewTim Zallmann2018-04-054-11/+127
* Merge branch 'direct-upload-of-uploads' into 'master'Grzegorz Bizon2018-04-051-4/+34
|\
| * Allow to store uploads by default on Object Storagedirect-upload-of-uploadsKamil Trzciński2018-04-041-4/+34
* | Merge branch 'dm-internal-user-namespace' into 'master'Sean McGivern2018-04-052-2/+4
|\ \
| * | Update column directly to prevent triggering before_save callbackDouwe Maan2018-04-051-2/+2
| * | Ensure internal users (ghost, support bot) get assigned a namespacedm-internal-user-namespaceDouwe Maan2018-04-051-0/+2
| |/
* | Merge branch 'ce-4474-custom-additional-text-in-confirmation-email' into 'mas...Sean McGivern2018-04-053-10/+83
|\ \
| * | Add custom additonal email text to all emailsce-4474-custom-additional-text-in-confirmation-emailEric Eastwood2018-04-043-10/+83
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2018-04-059-2/+306
|\ \ \
| * \ \ Merge branch 'bvl-export-import-lfs' into 'master'Douwe Maan2018-04-056-0/+260
| |\ \ \
| | * | | Add helper for accessing lfs_objects for projectBob Van Landuyt2018-04-051-0/+16
| | * | | Download LFS-files from object storage for exportsBob Van Landuyt2018-04-051-1/+23
| | * | | Import projects with LFS objectsBob Van Landuyt2018-04-054-1/+141
| | * | | Export LFS Objects when exporting a projectBob Van Landuyt2018-04-052-0/+82
| | |/ /
| * | | Merge branch 'issue_44551' into 'master'Sean McGivern2018-04-053-2/+46
| |\ \ \
| | * | | Fix 404 in group boards when moving issue between listsissue_44551Felipe Artur2018-04-033-2/+46
* | | | | Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'securit...Douwe Maan2018-04-0514-9/+302
* | | | | Merge branch '42028-xss-diffs-10-6' into 'security-10-6'Douwe Maan2018-04-051-2/+28
* | | | | Merge branch 'fl-fix-milestone-bug-10-6' into 'security-10-6'Phil Hughes2018-04-051-0/+17
|/ / / /
* | | | Merge branch '44922-fix-build-metadata-creation' into 'master'Kamil Trzciński2018-04-042-10/+1
|\ \ \ \
| * | | | Create metadata object on build object creationTomasz Maczukin2018-04-042-10/+1
* | | | | Merge branch 'dm-flatten-tree-plus-chars' into 'master'Robert Speicher2018-04-041-0/+10
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix links to subdirectories of a directory with a plus character in its pathdm-flatten-tree-plus-charsDouwe Maan2018-04-041-0/+10
| | |_|/ | |/| |
* | | | Merge branch 'dz-improve-app-settings-6' into 'master'Filipa Lacerda2018-04-041-2/+22
|\ \ \ \
| * | | | Move the rest of application settings to expandable blocksDmitriy Zaporozhets2018-04-041-2/+22
* | | | | Merge branch 'osw-41401-render-mr-commit-sha-instead-diffs' into 'master'Sean McGivern2018-04-041-0/+35
|\ \ \ \ \
| * | | | | Render MR commit SHA instead "diffs" when viableosw-41401-render-mr-commit-sha-instead-diffsOswaldo Ferreira2018-04-041-0/+35
* | | | | | Merge branch '44983-transient-failure-in-user_sorts_issues_spec' into 'master'Sean McGivern2018-04-041-3/+0
|\ \ \ \ \ \
| * | | | | | Fix a transient failure by removing unneeded expectationsRémy Coutable2018-04-041-3/+0
| | |_|_|/ / | |/| | | |
* | | | | | Allow assigning and filtering issuables by ancestor group labelsFelipe Artur2018-04-045-10/+392
* | | | | | Add banzai filter to detect commit message trailers and properly link the usersOmar Mekky2018-04-042-0/+212
|/ / / / /
* | | | | Merge branch 'sh-gitlab-sidekiq-logger' into 'master'Sean McGivern2018-04-042-0/+132
|\ \ \ \ \
| * | | | | Add support for Sidekiq JSON loggingStan Hu2018-04-042-0/+132
| | |_|/ / | |/| | |
* | | | | Merge branch 'zj-revert-bad-grouping' into 'master'Grzegorz Bizon2018-04-041-3/+1
|\ \ \ \ \
| * | | | | Revert "Allow CI/CD Jobs being grouped on version strings"Zeger-Jan van de Weg2018-04-041-3/+1
| |/ / / /
* | | | | Merge branch 'zj-feature-gate-remove-http-api' into 'master'Douwe Maan2018-04-041-2/+41
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow feature gate removal through the APIzj-feature-gate-remove-http-apiZeger-Jan van de Weg2018-04-031-2/+41
* | | | | 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