summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* changed additional places where cog was used for settings like group settings...change-project-settings-iconDimitrie Hoekstra2016-10-063-3/+3
* Changelog entry: Changed project-settings-button from fa-cog to fa-slidersDimitrie Hoekstra2016-10-061-0/+1
* changed project-settings-button from fa-cog to fa-slidersDimitrie Hoekstra2016-10-063-3/+3
* Fix CHANGELOG and wrong conflict resolutionRémy Coutable2016-10-062-9/+1
* Merge branch 'cs-flay-no-allow-failure' into 'master' Rémy Coutable2016-10-061-3/+1
|\
| * Don't allow flay to fail.cs-flay-no-allow-failureConnor Shea2016-10-051-3/+1
* | Add 8.12.4 CHANGELOG entriesRémy Coutable2016-10-061-7/+15
* | Merge remote-tracking branch 'dev/master'Rémy Coutable2016-10-065-5/+184
|\ \
| * \ Merge branch 'fix/id-claim-import-issue' into 'master' Douwe Maan2016-09-305-5/+184
| |\ \
| | * | updated attribute cleaner to use allowed keyword and reject attributesJames Lopez2016-09-271-3/+3
| | * | Prevent claiming associated model IDs via import and added relevant specsJames Lopez2016-09-275-5/+184
* | | | Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-0635-44/+193
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'raven-headers' into 'security' Rémy Coutable2016-10-055-4/+9
| |\ \ \
| | * | | Don't send Private-Token headers to SentryJacob Vosmaer2016-10-045-4/+9
| |/ / /
| * | | Merge branch 'fix/export-project-file-permissions' into 'security' Douwe Maan2016-10-0310-7/+27
| |\ \ \
| | * | | fix export project file permissions issueJames Lopez2016-09-3010-7/+27
| |/ / /
| * | | Merge branch 'fix/escape-builds-commands-in-ci-linter' into 'security' Robert Speicher2016-09-282-2/+36
| |\ \ \
| | * | | Escape HTML nodes in builds commands in ci linterGrzegorz Bizon2016-09-262-2/+36
| * | | | Merge branch '22435-no-api-state-change-via-rails-session' into 'security' Douwe Maan2016-09-2810-25/+63
| |\ \ \ \
| | * | | | Convert label creation from API to controller endpointNick Thomas2016-09-238-18/+26
| | * | | | API: disable rails session auth for non-GET/HEAD requestsNick Thomas2016-09-232-7/+37
| * | | | | Merge branch '18028-respect-fork-project' into 'security' Rémy Coutable2016-09-2810-7/+45
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add a CHANGELOG entryNick Thomas2016-09-271-0/+1
| | * | | | Enforce the fork_project permission in Projects::CreateServiceNick Thomas2016-09-279-7/+44
| |/ / / /
* | | | | Merge branch 'flash-cherry-pick-error' into 'master' Fatih Acet2016-10-052-7/+3
|\ \ \ \ \
| * | | | | Make flash-alert background transparent to match flash-notice.flash-cherry-pick-errorBryce Johnson2016-10-052-7/+3
* | | | | | Merge branch 'revert-c676283b' into 'master' Fatih Acet2016-10-0527-144/+638
|\ \ \ \ \ \
| * | | | | | Fix bad merge conflict resolution.Fatih Acet2016-10-051-2/+0
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-059-67/+66
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...revert-c676283bFatih Acet2016-10-0552-1817/+1741
| |\ \ \ \ \ \ \
| * | | | | | | | Set default value for show_menu_above variable.Fatih Acet2016-10-051-1/+2
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-0538-218/+690
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Add position menu above ability to glDropdown.Fatih Acet2016-10-047-39/+41
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-0449-169/+520
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Tweak issuable dropdowns to open above the dropdown.Fatih Acet2016-10-042-1/+29
| * | | | | | | | | Fix dropdown title when No Label selected.Fatih Acet2016-10-042-23/+41
| * | | | | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-0472-287/+458
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Tests updatePhil Hughes2016-10-032-7/+14
| * | | | | | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-031026-8393/+24747
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Updated testsPhil Hughes2016-09-022-2/+4
| * | | | | | | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-09-02299-1980/+5055
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed boards filtersPhil Hughes2016-08-302-1/+3
| * | | | | | | | | | | | Removed namespace testPhil Hughes2016-08-301-1/+1
| * | | | | | | | | | | | Fixed label toggle textPhil Hughes2016-08-301-14/+17
| * | | | | | | | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-08-301939-28434/+74752
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Updated wording in the specsPhil Hughes2016-07-212-6/+6
| * | | | | | | | | | | | | Removes @projects as not used anymore - getting selected data from controller...Phil Hughes2016-07-202-2/+2
| * | | | | | | | | | | | | Fixed up frontend code based on feedbackPhil Hughes2016-07-209-19/+16
| * | | | | | | | | | | | | Fixed failing issuable filter specsPhil Hughes2016-07-201-2/+2
| * | | | | | | | | | | | | Removed duplicate labels from the dropdown on dashboardPhil Hughes2016-07-204-22/+16