summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Include user relationship when retrieving award_emoji14320-note-grouped_awardsPaco Guzman2016-06-151-2/+6
* Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-141-0/+1
|\
| * Manually create todo for issuablePhil Hughes2016-06-141-0/+1
* | Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-141-4/+29
|\ \
| * \ Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-149-85/+84
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-132-9/+13
| |\ \ \
| * | | | Improve design based on reviewKamil Trzcinski2016-06-131-5/+4
| * | | | Show the artifacts expiration prompt in Build Artifacts widgetKamil Trzcinski2016-06-131-2/+2
| * | | | Add artifacts_expire_in method for Ci::BuildKamil Trzcinski2016-06-131-0/+12
| * | | | Move keep to ArtifactsControllerKamil Trzcinski2016-06-131-4/+4
| * | | | Allow to expire build artifactsKamil Trzcinski2016-06-131-2/+16
* | | | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-148-48/+41
* | | | | Factorize members mails into a new Emails::Members moduleRémy Coutable2016-06-141-0/+4
* | | | | Add request access for groupsRémy Coutable2016-06-149-91/+86
* | | | | Initial implementation of user access request to projectsDavid Alexander2016-06-144-6/+80
| |_|/ / |/| | |
* | | | Merge branch 'confidential-issues-in-private-projects' into 'master' Douwe Maan2016-06-145-28/+37
|\ \ \ \
| * | | | Use Issue.visible_to_user in Notes.search to avoid query duplicationDouglas Barbosa Alexandre2016-06-133-30/+14
| * | | | Project members with guest role can't access confidential issuesDouglas Barbosa Alexandre2016-06-135-12/+37
| | |_|/ | |/| |
* | | | Fix broken URI joining for `teamcity_url` with suffixesRémy Coutable2016-06-141-18/+19
* | | | Factorize duplicated code into a method in BambooService and update specsRémy Coutable2016-06-141-20/+17
* | | | Fix broken URI joining for `bamboo_url` with suffixesBenjamin Schmid2016-06-141-4/+4
* | | | Honor credentials on calling Bamboo CI triggerBenjamin Schmid2016-06-141-4/+13
|/ / /
* | | Remove deprecated issues_tracker and issues_tracker_id from projectDouglas Barbosa Alexandre2016-06-132-20/+3
| |/ |/|
* | Merge branch 'issue_3359_2' into 'master' Douwe Maan2016-06-132-9/+13
|\ \ | |/ |/|
| * Remove notification level fild from users, improve migrations and specsissue_3359_2Felipe Artur2016-06-101-3/+6
| * Remove notification level from user modelFelipe Artur2016-06-102-9/+10
* | Merge branch 'finding-multiple-projects-by-paths' into 'master' Robert Speicher2016-06-101-11/+60
|\ \
| * | Add Project.where_paths_infinding-multiple-projects-by-pathsYorick Peterse2016-06-101-11/+60
* | | Remove unused MergeRequest#gitlab_merge_status methodRémy Coutable2016-06-101-8/+0
* | | Merge branch 'rename-ci-commit-phase-4' into 'master' Rémy Coutable2016-06-101-1/+1
|\ \ \
| * | | Rename commit to pipeline in TriggerRequestKamil Trzcinski2016-06-091-1/+1
| |/ /
* | | Cache the presence of an issue_tracker at project levelPaco Guzman2016-06-102-3/+25
| |/ |/|
* | Merge branch 'fix/incremental-trace-update-api' into 'master' Rémy Coutable2016-06-101-2/+2
|\ \
| * | Fix UTF-8 handling in incremental trace update APITomasz Maczukin2016-06-101-2/+2
| |/
* | Rename ci_commit -> pipelineRémy Coutable2016-06-101-1/+1
* | Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergea...Rémy Coutable2016-06-101-5/+7
* | Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb'...Rémy Coutable2016-06-101-5/+14
* | Allow or not merge MR with failed buildRui Anderson2016-06-101-1/+5
|/
* Allow custom text on 'almost there' pageSean McGivern2016-06-081-1/+4
* Fix pseudo n+1 queries with Note and Note Authors in issuables APIsAlejandro Rodríguez2016-06-081-3/+21
* Remove `projects` inclusion in `notes_with_associations` to skip some unneces...Alejandro Rodríguez2016-06-083-3/+3
* Merge branch 'notification-dropdown-labels' into 'master' Jacob Schatz2016-06-071-1/+1
|\
| * Notifications dropdown on project page now has descriptionsPhil Hughes2016-06-071-1/+1
* | Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-073-3/+38
|\ \ | |/ |/|
| * Fix label order by priority on labels pageissue_14189Sean McGivern2016-06-071-2/+2
| * Remove unnecessary null-specific orderSean McGivern2016-06-061-2/+2
| * typoAlfredo Sumaran2016-06-061-1/+1
| * Update method nameAlfredo Sumaran2016-06-061-2/+2
| * Add unprioritized scopeAlfredo Sumaran2016-06-061-3/+5
| * Improve Issuable.order_labels_priorityRémy Coutable2016-06-063-29/+30
View Lorry Controller Status