summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Add a /wip slash commandThomas Balthazar2016-10-031-4/+20
* Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have...Robert Speicher2016-10-026-82/+112
|\
| * Use the new Members::ApproveAccessRequestService in Member#add_user21983-member-add_user-doesn-t-detect-existing-members-that-have-requested-accessRémy Coutable2016-09-281-1/+1
| * Allow Member.add_user to handle access requestersRémy Coutable2016-09-286-82/+112
* | Merge branch 'rc-new-members-request-access-service' into 'master' Robert Speicher2016-10-021-4/+1
|\ \
| * | Remove duplicate methodsRémy Coutable2016-09-222-8/+0
| * | Re-add the AccessRequestable concernRémy Coutable2016-09-223-0/+15
| * | New Members::RequestAccessServiceRémy Coutable2016-09-223-18/+8
* | | Merge branch '22768-revert-to-touch-file-system' into 'master' Valery Sizov2016-09-301-1/+1
|\ \ \
| * | | Revert to use Mounter method to check existence22768-revert-to-touch-file-systemPaco Guzman2016-09-301-1/+1
| | |/ | |/|
* | | Allowing ">" to be used for Milestone models's title and storing the value in...Makoto Scott-Hinkle2016-09-291-1/+5
|/ /
* | Improve how MergeCommit#merge_commit_message builds the messageRobert Speicher2016-09-271-7/+5
* | Merge branch '22578-cycle-analytics-incorrect-commit-count'Douwe Maan2016-09-271-5/+23
|\ \
| * | Fix the "Commits" section of the cycle analytics summary.Timothy Andrew2016-09-261-5/+23
* | | Improve project_with_board factory to create the default listsimprovement/project-with-board-factoryDouglas Barbosa Alexandre2016-09-261-0/+8
|/ /
* | Fixes issue with rails reserved keyword type exporting/importing services. Al...James Lopez2016-09-261-0/+4
* | Merge branch 'fix/database-seeds' into 'master' Rémy Coutable2016-09-231-1/+1
|\ \
| * | Fix pipeline fixtures for development environmentGrzegorz Bizon2016-09-221-1/+1
| |/
* | Use select(:foo) instead of map(&:foo) in GlobalMilestoneAhmad Sherif2016-09-231-3/+3
* | Ensure milestones passed to GlobalMilestone is an ActiveRecord::RelationAhmad Sherif2016-09-231-13/+4
* | Reduce number of queries when calling GlobalMilestone#{labels,participants}Ahmad Sherif2016-09-231-2/+12
* | Eager-load assignee and labels associations for GlobalMilestore issuablesAhmad Sherif2016-09-231-2/+2
* | 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 '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-214-8/+7
|\ \
| * | Start Frontend work, fix routing problemZ.J. van de Weg2016-09-193-8/+6
| * | Snippets get award emoji! :thumbsup:Z.J. van de Weg2016-09-191-0/+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 '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-212-3/+22
|\ \ \ \ \
| * | | | | Scope environments to projectlimit-number-of-shown-environmentsKamil Trzcinski2016-09-211-1/+1
| * | | | | Add tests to verify the correctness of returned environmentsKamil Trzcinski2016-09-212-4/+4
| * | | | | Limit number of shown environments for Merge RequestsKamil Trzcinski2016-09-212-3/+22
* | | | | | 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 'post-merge-improve-of-ci-permissions' into 'master' Rémy Coutable2016-09-211-2/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Post-merge improve of CI permissionsKamil Trzcinski2016-09-201-2/+5
| | |_|/ / | |/| | |
* | | | | Merge branch '21170-cycle-analytics' into 'master' Stan Hu2016-09-2111-1/+248
|\ \ \ \ \ | |_|/ / / |/| | | |