summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* For empty merge_request_diff st_commits would be nilfix-pipeline-for-empty-merge-request-diffLin Jen-Shin2016-09-221-1/+3
* 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
* | | | | | | | | Added horizontal padding on build page sidebar on code coverage blockVitaly Baev2016-09-211-0/+4
* | | | | | | | | Merge branch 'add_spec_for_committer_hash' into 'master' Rémy Coutable2016-09-211-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Add spec covering 'committer_hash'Dan Dunckel2016-09-201-1/+1
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-09-2195-420/+1309
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'post-merge-improve-of-ci-permissions' into 'master' Rémy Coutable2016-09-214-9/+12
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Improve JwtController implementationpost-merge-improve-of-ci-permissionsKamil Trzcinski2016-09-202-4/+4
| | * | | | | | | | Post-merge improve of CI permissionsKamil Trzcinski2016-09-202-5/+8
| * | | | | | | | | Merge branch '21170-cycle-analytics' into 'master' Stan Hu2016-09-2127-3/+639
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Implement fourth round of comments from @DouweM.Timothy Andrew2016-09-211-3/+8
| | * | | | | | | | | Remove unnecessary #{} in cycle analytics template.Fatih Acet2016-09-211-1/+1
| | * | | | | | | | | Update cycle analytics icon and fix color of the dismiss button.Fatih Acet2016-09-212-1/+2
| | * | | | | | | | | Use triple dashes for the empty value in cycle analytics.Fatih Acet2016-09-211-1/+1
| | * | | | | | | | | Fix typo on cycle analytics copy.Fatih Acet2016-09-211-1/+1
| | * | | | | | | | | Add page title and fix sub menu width in Cycle Analytics page.Fatih Acet2016-09-211-1/+3
| | * | | | | | | | | Update Cycle Analytics Read more link URL.Fatih Acet2016-09-211-1/+1
| | * | | | | | | | | Display the cycle analytics navbar based on the `:read_cycle_analytics` ability.Timothy Andrew2016-09-211-1/+1