summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump the locked version for the fsevents optional dependencyrs-add-fseventsRobert Speicher2017-08-041-12/+167
* Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master'Robert Speicher2017-08-046-63/+96
|\
| * Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitalyAhmad Sherif2017-08-037-64/+97
* | Merge branch '35948-active-settings-pipelines' into 'master'Phil Hughes2017-08-041-1/+1
|\ \
| * | Add active state for pipelines settings on old nav35948-active-settings-pipelinesAnnabel Dunstone Gray2017-08-031-1/+1
* | | Merge branch '35659-rename-pipeline' into 'master'Annabel Dunstone Gray2017-08-043-6/+10
|\ \ \
| * | | 35659 Rename Pipelines tab to CI / CD in new navigation35659-rename-pipelinetauriedavis2017-08-033-6/+10
| |/ /
* | | Merge branch '32388-validate-and-document-openshift-support' into 'master'Achilleas Pipinellis2017-08-0417-1/+511
|\ \ \
| * | | Fix different Markdown stylesAchilleas Pipinellis2017-08-042-28/+4
| * | | Openshift Getting Started32388-validate-and-document-openshift-supportJoshua Lambert2017-08-0417-1/+535
| |/ /
* | | Merge branch 'rs-issue-35701' into 'master'Rémy Coutable2017-08-041-0/+2
|\ \ \
| * | | Ensure DeviseHelpers is loaded before inclusion in LoginHelpersrs-issue-35701Robert Speicher2017-08-031-0/+2
* | | | Merge branch 'sh-bump-gitlab-shell-gitaly' into 'master'Stan Hu2017-08-042-2/+2
|\ \ \ \
| * | | | Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refssh-bump-gitlab-shell-gitalyStan Hu2017-08-042-2/+2
|/ / / /
* | | | Merge branch 'refactor.notification-recipient-builders' into 'master'Sean McGivern2017-08-046-329/+389
|\ \ \ \
| * | | | another rubocop style fixrefactor.notification-recipient-buildershttp://jneen.net/2017-08-031-1/+1
| * | | | rubocop style fixhttp://jneen.net/2017-08-031-1/+1
| * | | | add a comment warning that note.project may be nilhttp://jneen.net/2017-08-031-0/+4
| * | | | remove build_relabeled_recipientshttp://jneen.net/2017-08-032-20/+7
| * | | | move the read_ability logic into NotificationRecipienthttp://jneen.net/2017-08-033-21/+18
| * | | | rm unused methodshttp://jneen.net/2017-08-031-26/+0
| * | | | disable the delegate cophttp://jneen.net/2017-08-031-0/+1
| * | | | declarative_policy rubocop fixhttp://jneen.net/2017-08-031-2/+3
| * | | | deparameterize `project`http://jneen.net/2017-08-032-41/+37
| * | | | unmemoize read_abilityhttp://jneen.net/2017-08-031-8/+9
| * | | | rm unused NewNote#subjecthttp://jneen.net/2017-08-031-4/+0
| * | | | clearer argument namehttp://jneen.net/2017-08-031-2/+2
| * | | | use the accessor for `type`http://jneen.net/2017-08-031-1/+1
| * | | | fix commenthttp://jneen.net/2017-08-031-1/+2
| * | | | use safe navigation on notification_settinghttp://jneen.net/2017-08-031-1/+1
| * | | | short-circuit if there is no policy, and add :read_project checkhttp://jneen.net/2017-08-033-12/+16
| * | | | force queries to include notification settingshttp://jneen.net/2017-08-031-2/+11
| * | | | use a simple pluck, since equivalent filtering happens laterhttp://jneen.net/2017-08-031-3/+1
| * | | | style fixeshttp://jneen.net/2017-08-032-8/+10
| * | | | don't require projecthttp://jneen.net/2017-08-031-3/+1
| * | | | .notifiable_users: compact the passed-in usershttp://jneen.net/2017-08-031-1/+1
| * | | | default the project to target.projecthttp://jneen.net/2017-08-033-6/+13
| * | | | require that the user be able to :read_buildhttp://jneen.net/2017-08-031-1/+2
| * | | | make sure users have to be able to read_pipelinehttp://jneen.net/2017-08-031-1/+2
| * | | | use intersection and diff operators instead of eachhttp://jneen.net/2017-08-031-22/+2
| * | | | make sure #custom_action is always definedhttp://jneen.net/2017-08-031-0/+4
| * | | | move Recipient to its own NotificationRecipient filehttp://jneen.net/2017-08-032-109/+109
| * | | | move the #build_* methods to static, parameterize the projecthttp://jneen.net/2017-08-032-41/+40
| * | | | rm a now-useless spechttp://jneen.net/2017-08-031-34/+0
| * | | | factor out .notifiable_usershttp://jneen.net/2017-08-032-41/+8
| * | | | don't elevate to :watch if no @custom_action is providedhttp://jneen.net/2017-08-031-1/+1
| * | | | rm the @builder argument and factor out .notifiable_usershttp://jneen.net/2017-08-032-15/+38
| * | | | move filtering logic into Recipient classhttp://jneen.net/2017-08-031-99/+102
| * | | | add builder helpers with levels and start to separate out #filter!http://jneen.net/2017-08-032-54/+118
| * | | | make recipients mutative during the buildhttp://jneen.net/2017-08-031-64/+73
View Lorry Controller Status