summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-07379-2239/+4368
|\
| * Fix issues with pdf-js dependenciesMike Greiling2017-08-071-2/+2
| * Merge branch 'ci-lint-fix' into 'master'Tim Zallmann2017-08-062-1/+4
| |\
| | * Fix order of CI lint ace editor loadingci-lint-fixPhil Hughes2017-08-042-1/+4
| * | Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master'Tim Zallmann2017-08-065-7/+22
| |\ \
| | * | adjust user contribution calendar time formattingMike Greiling2017-07-311-3/+3
| | * | display system timezone underneath activity calendarMike Greiling2017-07-282-0/+6
| | * | ensure user profile calendar is generated based on server timezone, not local...Mike Greiling2017-07-283-4/+13
| * | | Merge branch 'fix/sm/34547-cannot-connect-to-ci-server-error-messages' into '...Sean McGivern2017-08-041-1/+6
| |\ \ \
| | * | | essentialShinya Maeda2017-08-041-1/+6
| * | | | Merge branch 'fix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run...Sean McGivern2017-08-041-1/+1
| |\ \ \ \
| | * | | | fixShinya Maeda2017-08-041-1/+1
| | |/ / /
| * | | | Update top bar issues iconAnnabel Dunstone Gray2017-08-045-5/+13
| * | | | Merge branch 'fix-pipeline-icon-contextual-nav' into 'master'Annabel Dunstone Gray2017-08-041-2/+2
| |\ \ \ \
| | * | | | Fix pipeline icon in contextual nav for projectstauriedavis2017-08-041-2/+2
| * | | | | Merge branch '34060-simplified-general-project-settings' into 'master'Mike Greiling2017-08-045-222/+239
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fixed up specsPhil Hughes2017-07-281-44/+44
| | * | | | trying to fix teststauriedavis2017-07-281-2/+2
| | * | | | fix merge conflictstauriedavis2017-07-281-215/+215
| | * | | | css fixestauriedavis2017-07-282-58/+63
| | * | | | try and fix some teststauriedavis2017-07-281-1/+1
| | * | | | 34060 Simply general project settings to use expanded panelstauriedavis2017-07-285-190/+202
| * | | | | Merge branch 'winh-new-dropdown-dividers' into 'master'Annabel Dunstone Gray2017-08-042-0/+8
| |\ \ \ \ \
| | * | | | | Make new dropdown dividers full widthwinh-new-dropdown-dividerswinh2017-08-042-0/+8
| * | | | | | Merge branch '35944-missing-sidebar-icons' into 'master'Phil Hughes2017-08-044-2/+4
| |\ \ \ \ \ \
| | * | | | | | Add container registry and spam logs iconsAnnabel Dunstone Gray2017-08-044-2/+4
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch '2902-standalone-ee-dir-ce' into 'master'Rémy Coutable2017-08-043-5/+5
| |\ \ \ \ \ \
| | * | | | | | Backport to CE for:2902-standalone-ee-dir-ceLin Jen-Shin2017-08-043-5/+5
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'feature/migrate-last-commit-for-path-to-gitaly' into 'master'Robert Speicher2017-08-041-5/+29
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Migrate Repository#last_commit_for_path to GitalyAhmad Sherif2017-08-031-5/+29
| * | | | | | 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-042-6/+6
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | 35659 Rename Pipelines tab to CI / CD in new navigation35659-rename-pipelinetauriedavis2017-08-032-6/+6
| | |/ / / /
| * | | | | Merge branch 'refactor.notification-recipient-builders' into 'master'Sean McGivern2017-08-043-291/+374
| |\ \ \ \ \
| | * | | | | 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
| | * | | | | 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-032-8/+7