Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | changed additional places where cog was used for settings like group settings...change-project-settings-icon | Dimitrie Hoekstra | 2016-10-06 | 3 | -3/+3 |
* | Changelog entry: Changed project-settings-button from fa-cog to fa-sliders | Dimitrie Hoekstra | 2016-10-06 | 1 | -0/+1 |
* | changed project-settings-button from fa-cog to fa-sliders | Dimitrie Hoekstra | 2016-10-06 | 3 | -3/+3 |
* | Fix CHANGELOG and wrong conflict resolution | Rémy Coutable | 2016-10-06 | 2 | -9/+1 |
* | Merge branch 'cs-flay-no-allow-failure' into 'master' | Rémy Coutable | 2016-10-06 | 1 | -3/+1 |
|\ | |||||
| * | Don't allow flay to fail.cs-flay-no-allow-failure | Connor Shea | 2016-10-05 | 1 | -3/+1 |
* | | Add 8.12.4 CHANGELOG entries | Rémy Coutable | 2016-10-06 | 1 | -7/+15 |
* | | Merge remote-tracking branch 'dev/master' | Rémy Coutable | 2016-10-06 | 5 | -5/+184 |
|\ \ | |||||
| * \ | Merge branch 'fix/id-claim-import-issue' into 'master' | Douwe Maan | 2016-09-30 | 5 | -5/+184 |
| |\ \ | |||||
| | * | | updated attribute cleaner to use allowed keyword and reject attributes | James Lopez | 2016-09-27 | 1 | -3/+3 |
| | * | | Prevent claiming associated model IDs via import and added relevant specs | James Lopez | 2016-09-27 | 5 | -5/+184 |
* | | | | Merge commit 'dev/security' into 'master' | Rémy Coutable | 2016-10-06 | 35 | -44/+193 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Merge branch 'raven-headers' into 'security' | Rémy Coutable | 2016-10-05 | 5 | -4/+9 |
| |\ \ \ | |||||
| | * | | | Don't send Private-Token headers to Sentry | Jacob Vosmaer | 2016-10-04 | 5 | -4/+9 |
| |/ / / | |||||
| * | | | Merge branch 'fix/export-project-file-permissions' into 'security' | Douwe Maan | 2016-10-03 | 10 | -7/+27 |
| |\ \ \ | |||||
| | * | | | fix export project file permissions issue | James Lopez | 2016-09-30 | 10 | -7/+27 |
| |/ / / | |||||
| * | | | Merge branch 'fix/escape-builds-commands-in-ci-linter' into 'security' | Robert Speicher | 2016-09-28 | 2 | -2/+36 |
| |\ \ \ | |||||
| | * | | | Escape HTML nodes in builds commands in ci linter | Grzegorz Bizon | 2016-09-26 | 2 | -2/+36 |
| * | | | | Merge branch '22435-no-api-state-change-via-rails-session' into 'security' | Douwe Maan | 2016-09-28 | 10 | -25/+63 |
| |\ \ \ \ | |||||
| | * | | | | Convert label creation from API to controller endpoint | Nick Thomas | 2016-09-23 | 8 | -18/+26 |
| | * | | | | API: disable rails session auth for non-GET/HEAD requests | Nick Thomas | 2016-09-23 | 2 | -7/+37 |
| * | | | | | Merge branch '18028-respect-fork-project' into 'security' | Rémy Coutable | 2016-09-28 | 10 | -7/+45 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Add a CHANGELOG entry | Nick Thomas | 2016-09-27 | 1 | -0/+1 |
| | * | | | | Enforce the fork_project permission in Projects::CreateService | Nick Thomas | 2016-09-27 | 9 | -7/+44 |
| |/ / / / | |||||
* | | | | | Merge branch 'flash-cherry-pick-error' into 'master' | Fatih Acet | 2016-10-05 | 2 | -7/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Make flash-alert background transparent to match flash-notice.flash-cherry-pick-error | Bryce Johnson | 2016-10-05 | 2 | -7/+3 |
* | | | | | | Merge branch 'revert-c676283b' into 'master' | Fatih Acet | 2016-10-05 | 27 | -144/+638 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix bad merge conflict resolution. | Fatih Acet | 2016-10-05 | 1 | -2/+0 |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b... | Fatih Acet | 2016-10-05 | 9 | -67/+66 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...revert-c676283b | Fatih Acet | 2016-10-05 | 52 | -1817/+1741 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Set default value for show_menu_above variable. | Fatih Acet | 2016-10-05 | 1 | -1/+2 |
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b... | Fatih Acet | 2016-10-05 | 38 | -218/+690 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Add position menu above ability to glDropdown. | Fatih Acet | 2016-10-04 | 7 | -39/+41 |
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b... | Fatih Acet | 2016-10-04 | 49 | -169/+520 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Tweak issuable dropdowns to open above the dropdown. | Fatih Acet | 2016-10-04 | 2 | -1/+29 |
| * | | | | | | | | | Fix dropdown title when No Label selected. | Fatih Acet | 2016-10-04 | 2 | -23/+41 |
| * | | | | | | | | | Merge branch 'master' into revert-c676283b | Phil Hughes | 2016-10-04 | 72 | -287/+458 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Tests update | Phil Hughes | 2016-10-03 | 2 | -7/+14 |
| * | | | | | | | | | | Merge branch 'master' into revert-c676283b | Phil Hughes | 2016-10-03 | 1026 | -8393/+24747 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Updated tests | Phil Hughes | 2016-09-02 | 2 | -2/+4 |
| * | | | | | | | | | | | Merge branch 'master' into revert-c676283b | Phil Hughes | 2016-09-02 | 299 | -1980/+5055 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fixed boards filters | Phil Hughes | 2016-08-30 | 2 | -1/+3 |
| * | | | | | | | | | | | | Removed namespace test | Phil Hughes | 2016-08-30 | 1 | -1/+1 |
| * | | | | | | | | | | | | Fixed label toggle text | Phil Hughes | 2016-08-30 | 1 | -14/+17 |
| * | | | | | | | | | | | | Merge branch 'master' into revert-c676283b | Phil Hughes | 2016-08-30 | 1939 | -28434/+74752 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Updated wording in the specs | Phil Hughes | 2016-07-21 | 2 | -6/+6 |
| * | | | | | | | | | | | | | Removes @projects as not used anymore - getting selected data from controller... | Phil Hughes | 2016-07-20 | 2 | -2/+2 |
| * | | | | | | | | | | | | | Fixed up frontend code based on feedback | Phil Hughes | 2016-07-20 | 9 | -19/+16 |
| * | | | | | | | | | | | | | Fixed failing issuable filter specs | Phil Hughes | 2016-07-20 | 1 | -2/+2 |
| * | | | | | | | | | | | | | Removed duplicate labels from the dropdown on dashboard | Phil Hughes | 2016-07-20 | 4 | -22/+16 |