summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Convert label creation from API to controller endpointNick Thomas2016-09-238-18/+26
* Merge branch 'revert-6455-and-4960' into 'master' Douwe Maan2016-09-227-40/+16
|\
| * Revert part of "Merge branch 'update_issues_mr_counter' into 'master'Rémy Coutable2016-09-227-31/+18
| * Revert "Merge branch '22421-fix-issuable-counter-when-more-than-one-label-is-...Rémy Coutable2016-09-221-13/+2
* | Merge branch 'fix-mr-version-dropdowns' into 'master' Fatih Acet2016-09-221-34/+38
|\ \
| * | fix dropdowns for mr-versionsfix-mr-version-dropdownstauriedavis2016-09-221-34/+38
| |/
* | Merge branch 'search-field-ignores' into 'master' Rémy Coutable2016-09-221-17/+24
|\ \
| * | Intercept issues search form submit to preserve filters.search-field-ignoresBryce2016-09-221-17/+24
* | | Merge branch 'hotfix-gl-dropdown-field-undefined' into 'master' Rémy Coutable2016-09-221-12/+13
|\ \ \ | |_|/ |/| |
| * | Added checks for field before field.length and removed unneeded fieldNamehotfix-gl-dropdown-field-undefinedLuke Bennett2016-09-201-12/+13
* | | Merge branch 'fix-pipeline-for-empty-merge-request-diff' into 'master' Rémy Coutable2016-09-221-1/+5
|\ \ \
| * | | So that st_commits could never be nilLin Jen-Shin2016-09-221-4/+6
| * | | For empty merge_request_diff st_commits would be nilfix-pipeline-for-empty-merge-request-diffLin Jen-Shin2016-09-221-1/+3
| | |/ | |/|
* | | Merge branch 'bpj-merge-request-diff-fixes' into 'master' Rémy Coutable2016-09-222-8/+6
|\ \ \
| * | | Stop disabling jump_to_next buttons, when not on latest MR diff.bpj-merge-request-diff-fixesBryce Johnson2016-09-221-3/+1
| * | | Remove colons in dropdowns, use icon helper, and fix 'Show original' link.Bryce Johnson2016-09-221-5/+5
| |/ /
* | | Hotfix the issuable counters when filtering by multiple labels22421-fix-issuable-counter-when-more-than-one-label-is-selectedRémy Coutable2016-09-221-2/+13
|/ /
* | Merge branch 'reorganize_sections_in_admin_settings' into 'master' Achilleas Pipinellis2016-09-211-22/+32
|\ \
| * | Reorganize sections in Admin area settingsreorganize_sections_in_admin_settingsAchilleas Pipinellis2016-09-211-22/+32
* | | Merge branch 'zj-default-setting-features' into 'master' Robert Speicher2016-09-211-0/+6
|\ \ \
| * | | Remove duplicate default_value_level entryzj-default-setting-featuresZeger-Jan van de Weg2016-09-211-1/+0
| * | | Add default values for ProjectFeatureZ.J. van de Weg2016-09-211-0/+7
| |/ /
* | | Merge branch 'and-you-get-awards' into 'master' Rémy Coutable2016-09-2114-23/+61
|\ \ \
| * | | Fix styling of award emoji block for snippets after upstream design changes.Fatih Acet2016-09-193-11/+19
| * | | Fix tests for Snippets toggling awardsZ.J. van de Weg2016-09-192-7/+11
| * | | Start Frontend work, fix routing problemZ.J. van de Weg2016-09-199-11/+29
| * | | Snippets get award emoji! :thumbsup:Z.J. van de Weg2016-09-193-2/+10
* | | | Merge branch 'correct-builds-pipeline-commit-header-to-build-header' into 'ma...Fatih Acet2016-09-211-1/+1
|\ \ \ \
| * | | | Changed `Commit` to `Build` headercorrect-builds-pipeline-commit-header-to-build-headerLuke Bennett2016-09-181-1/+1
* | | | | Merge branch 'rs-simplify-fetch_members' into 'master' Rémy Coutable2016-09-211-32/+40
|\ \ \ \ \
| * | | | | Simplify invited_group_members filter-by-levelRobert Speicher2016-09-211-6/+6
| * | | | | Use `public_send` over `send` in ProjectTeamRobert Speicher2016-09-211-3/+3
| * | | | | Improve clarity of variable names in ProjectTeam#fetch_invited_membersrs-simplify-fetch_membersRobert Speicher2016-09-201-14/+12
| * | | | | Fix a logic error in ProjectTeam#fetch_invited_membersRobert Speicher2016-09-201-2/+2
| * | | | | Simplify ProjectTeam#fetch_members to satisfy flogRobert Speicher2016-09-201-30/+40
* | | | | | Merge branch 'shrink-profile-info' into 'master' Fatih Acet2016-09-215-61/+89
|\ \ \ \ \ \
| * | | | | | clean up profileshrink-profile-infotauriedavis2016-09-163-56/+82
| * | | | | | shrink profile infotauriedavis2016-09-164-37/+39
* | | | | | | Merge branch 'show-all-pipelines-from-all-diffs' into 'master' Rémy Coutable2016-09-212-4/+25
|\ \ \ \ \ \ \
| * | | | | | | If merge request wasn't persisted yet, we show only 1 pipeline:Lin Jen-Shin2016-09-201-7/+11
| * | | | | | | slightly tweak about the comment, feedback:Lin Jen-Shin2016-09-201-1/+1
| * | | | | | | Introduce MergeRequest#all_commits_sha, feedback:Lin Jen-Shin2016-09-201-8/+9
| * | | | | | | Show all pipelines from all merge_request_diffs:Lin Jen-Shin2016-09-192-3/+19
* | | | | | | | Merge branch 'limit-number-of-shown-environments' into 'master' Rémy Coutable2016-09-214-15/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | Scope environments to projectlimit-number-of-shown-environmentsKamil Trzcinski2016-09-213-2/+6
| * | | | | | | | Fix project for merge_request environmentsKamil Trzcinski2016-09-211-1/+1
| * | | | | | | | Add tests to verify the correctness of returned environmentsKamil Trzcinski2016-09-213-5/+5
| * | | | | | | | Limit number of shown environments for Merge RequestsKamil Trzcinski2016-09-213-14/+34
* | | | | | | | | Merge branch '20310-new-project-btn' into 'master' Jacob Schatz2016-09-213-3/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix new project button alignment20310-new-project-btnAnnabel Dunstone Gray2016-09-143-3/+15
View Lorry Controller Status