summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'github-importer' into 'master' Douwe Maan2016-08-241-2/+0
|\
| * Does not halt the GitHub import process when an error occursDouglas Barbosa Alexandre2016-08-241-2/+0
* | Show "Create Merge Request" widget for push events to fork projects on the so...Paco Guzman2016-08-241-2/+2
|/
* Also check if Akismet is enabled, before showing the `Submit as spam` button.fix-spam-submit-buttonPatricio Cano2016-08-221-1/+1
* Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-221-0/+6
* Fix Error 500 resulting when loading network graphfix-network-graph-error-500Stan Hu2016-08-201-0/+2
* Make Ability#project_abilities return unique values and fix countsfix-rspec-failures-due-to-cached-permissionsStan Hu2016-08-201-1/+1
* Fix assorted rspec failures due to stale, cached user permissionsStan Hu2016-08-201-21/+27
* Merge branch 'disable-issue-by-email' into 'master' Robert Speicher2016-08-201-1/+4
|\
| * Disable “issue by email” feature until it uses a different tokenDouwe Maan2016-08-191-1/+4
* | Merge branch 'fix-diff-note-discussion-id' into 'master' Rubén Dávila Santos2016-08-201-0/+3
|\ \
| * | Call `set_discussion_id` again in DiffNote `before_validation` because the or...Douwe Maan2016-08-191-0/+3
| |/
* | Merge branch 'issue_18135' into 'master' Douwe Maan2016-08-193-15/+37
|\ \
| * | Todos sorting dropdownissue_18135Felipe Artur2016-08-193-15/+37
* | | Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' Stan Hu2016-08-192-1/+15
|\ \ \ | |_|/ |/| |
| * | Support integration with Koding (online IDE)Gokmen Goksel2016-08-192-1/+15
* | | Merge branch 'mark-as-processable' into 'master' Robert Speicher2016-08-193-0/+9
|\ \ \
| * | | Fix rubocop offense in pipeline modelmark-as-processableGrzegorz Bizon2016-08-191-1/+1
| * | | Make all future skipped builds as processable when retrying a buildKamil Trzcinski2016-08-183-0/+9
* | | | Merge branch 'fix-discussions-on-changed-lines' into 'master' Robert Speicher2016-08-194-0/+13
|\ \ \ \
| * | | | Fix bug where notes weren’t shown in discussion when the code had changed a...Douwe Maan2016-08-194-0/+13
* | | | | Merge branch 'wall-clock-time-for-showing-pipeline' into 'master' Robert Speicher2016-08-193-13/+17
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-1915-35/+358
| |\ \ \ \ | | |/ / /
| * | | | Use travel_to instead of dependency injection, feedback:Lin Jen-Shin2016-08-192-3/+3
| * | | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-1716-20/+154
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Introduce Gitlab::Utils.now so that it's easier to stubLin Jen-Shin2016-08-152-3/+3
| * | | | Merge remote-tracking branch 'upstream/pipeline-hooks-without-slack' into wal...Lin Jen-Shin2016-08-155-22/+13
| |\ \ \ \
| * | | | | Rename to total_duration and we're not using CommitStatus.durationLin Jen-Shin2016-08-152-6/+1
| * | | | | We could just sum with SQLLin Jen-Shin2016-08-151-1/+1
| * | | | | Update duration for wall-clock timeLin Jen-Shin2016-08-151-1/+1
| * | | | | Merge branch 'pipeline-hooks-without-slack' into wall-clock-time-for-showing-...Lin Jen-Shin2016-08-1513-130/+228
| |\ \ \ \ \
| * | | | | | Cleanup the use of duration and optimize some queriesLin Jen-Shin2016-08-103-17/+22
| * | | | | | Show wall-clock time when showing pipeline instead of:Lin Jen-Shin2016-08-091-0/+4
* | | | | | | Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-197-21/+53
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into 'expiration-date-on-memberships'Sean McGivern2016-08-196-29/+227
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-181-3/+4
| |\ \ \ \ \ \ \
| * | | | | | | | Allow project group links to be expiredSean McGivern2016-08-183-6/+19
| * | | | | | | | Add expiration date to group membershipsSean McGivern2016-08-183-14/+20
| * | | | | | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1844-199/+719
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Create Member.expired scope.Adam Niedzielski2016-08-091-0/+1
| * | | | | | | | | Remove scopes.Adam Niedzielski2016-08-042-3/+2
| * | | | | | | | | Add Member#expires? method.Adam Niedzielski2016-08-041-0/+4
| * | | | | | | | | Replace optional parameters with keyword arguments.Adam Niedzielski2016-08-024-9/+15
| * | | | | | | | | WIPAdam Niedzielski2016-08-014-7/+10
* | | | | | | | | | Fix line commenting for the initial commitSean McGivern2016-08-191-1/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Improve performance of MR show pageDouwe Maan2016-08-183-4/+5
* | | | | | | | | Fix MR note discussion IDDouwe Maan2016-08-181-1/+3
* | | | | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-181-3/+4
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch '17334-u2f-device-identifiers' into 'master' Robert Speicher2016-08-181-3/+4
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Allow naming U2F devices.Timothy Andrew2016-08-181-3/+4
| | | |_|_|_|/ / | | |/| | | | |