summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix conflict on users_selectClement Ho2017-05-121-606/+599
* Add additional EE checkClement Ho2017-05-111-1/+3
* Automatically close user dropdown for CEClement Ho2017-05-091-0/+9
* Merge branch 'dm-remove-unused-css-and-view' into 'master' Robert Speicher2017-05-093-33/+0
|\
| * Remove unused viewdm-remove-unused-css-and-viewDouwe Maan2017-05-081-4/+0
| * Remove unused CSSDouwe Maan2017-05-082-29/+0
* | Merge branch 'deltas-only' into 'master' Sean McGivern2017-05-093-5/+7
|\ \
| * | Use Rails 'delegate'Jacob Vosmaer2017-05-091-3/+1
| * | Don't make Commit#raw_deltas privateJacob Vosmaer2017-05-091-4/+4
| * | Don't use DiffCollection for deltasJacob Vosmaer2017-05-093-5/+9
* | | Merge branch '26944-prometheus-memory-sparkline' into 'master' Fatih Acet2017-05-096-74/+179
|\ \ \
| * | | Add Prometheus memory sparkline to MR widgetkushalpandya2017-05-096-74/+179
* | | | Merge branch 'issue_27168_2' into 'master' Sean McGivern2017-05-094-16/+13
|\ \ \ \
| * | | | Small code improvements and add migration specFelipe Artur2017-05-081-3/+2
| * | | | Fix specs 2Felipe Artur2017-05-081-8/+3
| * | | | Add merge requests association to pipelineFelipe Artur2017-05-081-0/+1
| * | | | Preloads head pipeline for each merge requestFelipe Artur2017-05-083-8/+10
| | |_|/ | |/| |
* | | | Merge branch '31888-follow-up-from-backport-of-multiple-assignees-feature' in...Sean McGivern2017-05-095-68/+71
|\ \ \ \
| * | | | Remove unnecessary if checkClement Ho2017-05-091-1/+1
| * | | | Refactor haml31888-follow-up-from-backport-of-multiple-assignees-featureClement Ho2017-05-084-20/+22
| * | | | Refactor block into separate partialClement Ho2017-05-082-49/+50
| |/ / /
* | | | Merge branch 'tc-cache-trackable-attributes' into 'master' Douwe Maan2017-05-091-0/+11
|\ \ \ \
| * | | | Devise can assign trackable fields, but only allow writes once/hourtc-cache-trackable-attributesToon Claes2017-05-081-4/+5
| * | | | Limit `update_tracked_fields` to write to database once/hourToon Claes2017-05-081-0/+10
* | | | | Prevent vue.esm.js from being bundled into the primary JS bundleMike Greiling2017-05-092-7/+14
* | | | | Merge branch 'tc-fix-snippets-notes-spec' into 'master' Sean McGivern2017-05-091-1/+1
|\ \ \ \ \
| * | | | | Fallback to default pattern when note does not belong to projecttc-fix-snippets-notes-specToon Claes2017-05-091-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix/gb/fix-skipped-manual-actions' into 'master' Kamil Trzciński2017-05-091-1/+1
|\ \ \ \ \
| * | | | | Fix skipped manual actions issue in pipeline processingfix/gb/fix-skipped-manual-actionsGrzegorz Bizon2017-05-081-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'up-arrow-focus-discussion-comment' into 'master' Filipa Lacerda2017-05-091-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed UP arrow key not editing last comment in discussionPhil Hughes2017-05-081-1/+1
| |/ / /
* | | | Merge branch 'mrchrisw-fix-slack-notify' into 'master' Sean McGivern2017-05-091-1/+1
|\ \ \ \
| * | | | Fix notify_only_default_branch check for Slack servicemrchrisw-fix-slack-notifyChris Wilson2017-05-081-1/+1
| | |/ / | |/| |
* | | | Merge request widget redesignFatih Acet2017-05-09108-825/+3071
| |_|/ |/| |
* | | Merge branch '28359-skip-process-commit-worker-unless-issues-referenced' into...31977-ensure-all-webpack-bundles-which-include-vue-are-children-of-common_vue-jsDmitriy Zaporozhets2017-05-084-2/+45
|\ \ \
| * | | Use regex to skip unnecessary reference processing in ProcessCommitWorkerJames Edwards-Jones2017-05-044-2/+45
* | | | Merge branch 'sh-fix-almost-there-spec-mysql' into 'master' Sean McGivern2017-05-081-0/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix sub-second timing comparison error for Devise confirmation periodsh-fix-almost-there-spec-mysqlStan Hu2017-05-071-0/+9
| | |/ | |/|
* | | Add confirm delete protected branch modalSam Rose2017-05-0811-38/+120
* | | Merge branch 'fix/gl-project-id' into 'master'James Lopez2017-05-081-6/+0
|\ \ \ | |/ / |/| |
| * | remove gl_project_id for I/E version updatefix/gl-project-idJames Lopez2017-05-021-6/+0
* | | Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master' Robert Speicher2017-05-071-7/+8
|\ \ \
| * | | Re-enable Gitaly commit_raw_diff featureAhmad Sherif2017-05-071-7/+8
* | | | Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-0736-66/+728
* | | | Move file loading to the top of the fileFilipa Lacerda2017-05-061-4/+4
* | | | Adds missing CSS classFilipa Lacerda2017-05-061-0/+5
* | | | Merge branch 'master' into 25226-realtime-pipelines-feFilipa Lacerda2017-05-0616-36/+112
|\ \ \ \ | |/ / /
| * | | Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ...Kamil Trzciński2017-05-0615-34/+109
| |\ \ \
| | * | | Do not reprocess actions when user retries pipelinefeature/gb/manual-actions-protected-branches-permissionsGrzegorz Bizon2017-05-051-0/+2
| | * | | Require build to be present in the controllerGrzegorz Bizon2017-05-051-2/+1