summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix appearance in error pagesLuis Alonso Chavez Armendariz2016-11-296-37/+105
* Merge branch 'yury-n/gitlab-ce-18852-milestone-pages-mobile' into 'master' Jacob Schatz2016-11-213-38/+143
|\
| * Updated CHANGELOGyury-n/gitlab-ce-18852-milestone-pages-mobileLuke Bennett2016-11-121-4/+2
| * Align the progress buttons with the milestone buttons -- do not margin right ...yury-n2016-11-041-12/+12
| * Replace long var name with a comment, hide "Milestone" in "Reopen Milestone" ...yury-n2016-11-041-5/+5
| * Respect the shrunk version of the status box that comes from the framework cssyury-n2016-11-041-3/+2
| * Do not shrink the status box on a large screenyury-n2016-11-041-1/+2
| * Make the milestone page more responsiveyury-n2016-11-043-36/+143
* | Merge branch 'zj-fix-time-ago-tooltip-chat-names' into 'master' Kamil Trzciński2016-11-211-1/+1
|\ \
| * | Evalute time_ago method instead of printing itZ.J. van de Weg2016-11-211-1/+1
* | | Merge branch 'chatops-deploy-command' into 'master' Rémy Coutable2016-11-211-1/+9
|\ \ \
| * | | Introduce deploy command that allows to start deployment from one environment...chatops-deploy-commandKamil Trzcinski2016-11-211-2/+2
| * | | Add deploy chat command [ci skip]Kamil Trzcinski2016-11-211-1/+9
* | | | Merge branch 'feature/send-registry-address-with-build-payload' into 'master' Kamil Trzciński2016-11-211-0/+4
|\ \ \ \
| * | | | Add Gitlab::Ci::Build::Credentials module with build credentials abstractionTomasz Maczukin2016-11-211-8/+1
| * | | | Send credentials array with build dataTomasz Maczukin2016-11-211-0/+11
* | | | | Merge branch 'fix-folders' into 'master' Fatih Acet2016-11-211-1/+3
|\ \ \ \ \
| * | | | | Remove statementFilipa Lacerda2016-11-211-2/+0
| * | | | | Fix permissions errorFilipa Lacerda2016-11-211-1/+5
* | | | | | Merge branch '24499-fix-activity-autoload-on-large-viewports' into 'master' Fatih Acet2016-11-217-106/+114
|\ \ \ \ \ \
| * | | | | | fix some code style issues according to feedback24499-fix-activity-autoload-on-large-viewportsMike Greiling2016-11-212-12/+16
| * | | | | | prevent infinite loop when no content is returnedMike Greiling2016-11-201-1/+1
| * | | | | | continue to auto-load content while the window is not scrollableMike Greiling2016-11-201-5/+16
| * | | | | | use param defaults and add spacing for readabilityMike Greiling2016-11-201-4/+7
| * | | | | | convert pager.js to es6 syntaxMike Greiling2016-11-201-36/+28
| * | | | | | rename pager.js to pager.js.es6Mike Greiling2016-11-201-0/+0
| * | | | | | convert activities.js to es6 class syntaxMike Greiling2016-11-204-32/+30
| * | | | | | rename activities.js to activities.js.es6Mike Greiling2016-11-201-0/+0
* | | | | | | Merge branch 'hide-empty-merge-request-diffs' into 'master' Sean McGivern2016-11-214-20/+19
|\ \ \ \ \ \ \
| * | | | | | | Hide box with CI status when there are no changes in merge requestAdam Niedzielski2016-11-211-1/+1
| * | | | | | | Return valid response in Projects::MergeRequestsController#ci_status when dif...Adam Niedzielski2016-11-211-1/+1
| * | | | | | | Warn that branch does not exist instead of saying that there isAdam Niedzielski2016-11-211-2/+2
| * | | | | | | Hide empty merge request diffs when comparing versionsAdam Niedzielski2016-11-212-4/+6
| * | | | | | | Revert "Do not create a MergeRequestDiff record when source branch is deleted"Adam Niedzielski2016-11-211-12/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'fix/cycle-analytics-no-data' into 'master' Sean McGivern2016-11-211-5/+15
|\ \ \ \ \ \ \
| * | | | | | | Updated code based on feedbackfix/cycle-analytics-no-dataJames Lopez2016-11-211-5/+1
| * | | | | | | rename methodJames Lopez2016-11-211-2/+2
| * | | | | | | Adds a flag to reflect whether or not there is data in cycle analyticsJames Lopez2016-11-211-5/+19
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix-xss-vulnerability' into 'master' Fatih Acet2016-11-215-37/+36
|\ \ \ \ \ \ \
| * | | | | | | Fixes identationfix-xss-vulnerabilityFilipa Lacerda2016-11-212-6/+4
| * | | | | | | Fix after reviewFilipa Lacerda2016-11-213-12/+6
| * | | | | | | Remove v-htmlFilipa Lacerda2016-11-214-25/+32
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'smarter-cache-invalidation' into 'master' Sean McGivern2016-11-215-228/+261
|\ \ \ \ \ \ \
| * | | | | | | Refactor cache refreshing/expiringYorick Peterse2016-11-214-222/+253
| * | | | | | | Use File.exist? to check if a repository existsYorick Peterse2016-11-211-5/+7
| * | | | | | | Unify detecting of special repository filesYorick Peterse2016-11-212-16/+16
| |/ / / / / /
* | | | | | | Merge branch 'issue_24303' into 'master' Sean McGivern2016-11-213-15/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Allow JIRA references for project snippetsissue_24303Felipe Artur2016-11-213-15/+18
* | | | | | | Merge branch 'fix/cycle-analytics-permissions' into 'master' Sean McGivern2016-11-212-1/+8
|\ \ \ \ \ \ \
| * | | | | | | refactored a couple of things based on feedbackfix/cycle-analytics-permissionsJames Lopez2016-11-212-6/+5
View Lorry Controller Status