summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Add Conversational Development Index page to admin panelTaurie Davis, Simon Knox and Adam Niedzielski2017-06-013-0/+66
* Merge branch 'fix-n-plus-one-queries-for-user-access' into 'master'Yorick Peterse2017-06-011-1/+8
|\
| * Fix N+1 queries for non-members in comment threadsfix-n-plus-one-queries-for-user-accessSean McGivern2017-06-011-1/+8
* | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-017-34/+24
|\ \
| * | Consistent diff and blob size limit namesDouwe Maan2017-05-297-34/+24
* | | Merge branch 'dm-emails-are-not-user-references' into 'master'Sean McGivern2017-06-011-0/+1
|\ \ \
| * | | Don't match email addresses or foo@bar as user referencesdm-emails-are-not-user-referencesDouwe Maan2017-05-311-0/+1
* | | | Merge branch 'dm-discussions-n-plus-1' into 'master'Sean McGivern2017-06-013-3/+9
|\ \ \ \
| * | | | Move includes call to scopedm-discussions-n-plus-1Douwe Maan2017-05-312-2/+2
| * | | | Resolve N+1 query issue with discussionsDouwe Maan2017-05-292-2/+8
| | |/ / | |/| |
* | | | Merge branch 'master' into 'trigger-source'Grzegorz Bizon2017-05-313-10/+7
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-313-10/+5
| |\ \ \
| | * \ \ Merge branch 'tc-improve-project-api-perf' into 'master'Douwe Maan2017-05-312-10/+1
| | |\ \ \
| | | * | | Remove some deprecated methodstc-improve-project-api-perfToon Claes2017-05-302-10/+0
| | | * | | Add starred_by scope to ProjectToon Claes2017-05-302-2/+3
| | | | |/ | | | |/|
| * | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-3111-154/+85
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-2637-155/+391
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-188-3/+63
| |\ \ \ \ \
| * | | | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-171-0/+6
* | | | | | | Introduce source to pipeline entitytrigger-sourceKamil Trzcinski2017-05-312-9/+11
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch '30892-add-api-support-for-pipeline-schedule' into 'master'Kamil Trzciński2017-05-311-0/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Define last_pipeline in PipelineScheduleEntityShinya Maeda2017-05-301-4/+0
| * | | | | Remove bang from update!Shinya Maeda2017-05-301-1/+1
| * | | | | Add own! method on PipleineScheduleShinya Maeda2017-05-301-0/+4
| * | | | | Add API support for pipeline scheduleShinya Maeda2017-05-301-0/+4
* | | | | | Merge branch '30410-revert-9347-and-10079' into 'master'Douwe Maan2017-05-302-9/+4
|\ \ \ \ \ \
| * | | | | | Don't allow to pass a user to ProjectWiki#http_url_to_repoRémy Coutable2017-05-301-5/+2
| * | | | | | Revert "Merge branch '1937-https-clone-url-username' into 'master' "Rémy Coutable2017-05-301-4/+2
* | | | | | | Don’t create comment on JIRA if link already existsJarka Kadlecova2017-05-301-3/+12
| |/ / / / / |/| | | | |
* | | | | | Merge branch '19107-404-when-creating-new-milestone-or-issue-for-project-that...Douwe Maan2017-05-301-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 'New issue'/'New merge request' dropdowns should show only projects with issu...19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabledblackst0ne2017-05-301-0/+1
* | | | | | Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master'Kamil Trzciński2017-05-291-7/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Validate parameters when active is falseShinya Maeda2017-05-291-7/+3
| |/ / / /
* | | | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-296-121/+38
|\ \ \ \ \
| * | | | | Hide nested group UI/API support for MySQLYorick Peterse2017-05-172-5/+1
| * | | | | Use CTEs for nested groups and authorizationsYorick Peterse2017-05-176-121/+42
* | | | | | Fix: Milestone - Participants list is showing duplicate assigneesfix_duplicated_assignees_on_milestone_pageValery Sizov2017-05-291-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'fix_counter_cache_invalidation' into 'master'Douwe Maan2017-05-261-2/+2
|\ \ \ \ \
| * | | | | Set "expire_in" for counters cacheValery Sizov2017-05-261-2/+2
| | |_|_|/ | |/| | |
* | | | | Add API URL to JIRA settings31448-jira-urlsJarka Kadlecova2017-05-261-12/+25
|/ / / /
* | | | Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-255-40/+33
|\ \ \ \
| * | | | Change code comment formattingdm-diff-cleanupDouwe Maan2017-05-231-1/+3
| * | | | Remove @commit in compare and MR controllersDouwe Maan2017-05-231-0/+3
| * | | | Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-235-40/+28
* | | | | Merge branch 'winh-label-textcolor-default' into 'master'Grzegorz Bizon2017-05-251-0/+4
|\ \ \ \ \
| * | | | | Provide default for calculating label text color (!11681)winh2017-05-251-0/+4
* | | | | | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-252-7/+5
|\ \ \ \ \ \
| * | | | | | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-242-7/+5
* | | | | | | Merge branch 'fix-kubernetes-namespace' into 'master'Grzegorz Bizon2017-05-251-12/+12
|\ \ \ \ \ \ \
| * | | | | | | Fix terminals support for Kubernetes serviceKamil Trzcinski2017-05-251-12/+12
View Lorry Controller Status