summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Update Rubocop to ruby 2.3zj-drop-ruby-21-testsZ.J. van de Weg2017-02-071-1/+1
* Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-061-0/+1
* Merge branch 'git_to_html_redirection' into 'master' Sean McGivern2017-02-031-1/+1
|\
| * Fixed redirection from http://someproject.git to http://someprojectblackst0ne2017-02-041-1/+1
* | Merge branch 'add-issues-to-boards' into 'master' Fatih Acet2017-02-031-3/+3
|\ \
| * | Disabled add issues button if no lists existPhil Hughes2017-02-031-1/+1
| * | Fixed issue with issue not persisting in listPhil Hughes2017-02-031-1/+1
| * | Reuse endpoint to list issues for a list instead of create a new oneDouglas Barbosa Alexandre2017-02-032-23/+2
| * | Infinite scrollingPhil Hughes2017-02-031-1/+1
| * | Used issue bulk update instead of different endpointPhil Hughes2017-02-032-5/+1
| * | Changed where data gets loadedPhil Hughes2017-02-032-1/+5
| * | Add issues to boards listPhil Hughes2017-02-031-1/+22
* | | Merge branch '27267-unnecessary-queries-from-projects-dashboard-atom-and-json...Sean McGivern2017-02-031-3/+1
|\ \ \
| * | | Remove unnecessary queries for .atom and .json in Dashboard::ProjectsControll...Oswaldo Ferreira2017-02-031-3/+1
* | | | Merge branch 'ref-switcher-perf' into 'master' Jacob Schatz2017-02-031-2/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Changed how the data is returned - we only care about the branch/tag namePhil Hughes2016-11-211-2/+3
| * | | Uses take rather than KaminariPhil Hughes2016-11-211-2/+2
| * | | Improved ref switcher dropdown performancePhil Hughes2016-11-211-2/+5
* | | | Merge branch 'fwn-to-find-by-full-path' into 'master' Dmitriy Zaporozhets2017-02-035-5/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-035-5/+5
* | | | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-023-23/+41
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-0210-21/+66
| |\ \ \
| * | | | Make sure different project gets a merge requestLin Jen-Shin2017-01-261-2/+4
| * | | | @tree_edit_project is no longer usedLin Jen-Shin2017-01-261-4/+1
| * | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2631-277/+398
| |\ \ \ \
| * | | | | Rename from base to start because base could mean merge baseLin Jen-Shin2017-01-061-3/+3
| * | | | | Detect if we really want a new merge request properlyLin Jen-Shin2017-01-061-2/+5
| * | | | | Properly fix the edge case!Lin Jen-Shin2017-01-061-2/+15
| * | | | | Rename source to base to avoid confusion from MRLin Jen-Shin2017-01-061-3/+3
| * | | | | Don't set invalid @mr_source_branch when create_merge_request?Lin Jen-Shin2017-01-061-6/+3
| * | | | | Fix for initial commit and remove unneeded argsLin Jen-Shin2017-01-061-3/+9
| * | | | | Just trust set_commit_variables to set everything!Lin Jen-Shin2017-01-062-8/+4
| * | | | | Merge request terms are reversed for GitOperationServiceLin Jen-Shin2017-01-051-4/+4
| * | | | | I think I am really confused, should be @tree_edit_projectLin Jen-Shin2017-01-051-1/+1
| * | | | | Indent the way rubocop likesLin Jen-Shin2017-01-051-2/+2
| * | | | | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-041-2/+2
| * | | | | Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-0435-192/+394
| |\ \ \ \ \
| * | | | | | Try to use those @mr variables for full correctnessLin Jen-Shin2016-12-141-4/+6
| * | | | | | Fix source_project and also pass source_projectLin Jen-Shin2016-12-141-2/+2
| * | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-122-6/+11
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-1011-23/+48
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-084-10/+30
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Introduce Repository#with_tmp_ref which we needLin Jen-Shin2016-12-081-1/+2
| * | | | | | | | | We still need it for empty repo for web UI!Lin Jen-Shin2016-12-081-1/+2
| * | | | | | | | | We probably don't need this anymore, not sure whyLin Jen-Shin2016-12-081-2/+1
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-0320-70/+192
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-11-245-9/+14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-11-2223-66/+233
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Try if branch_exists? would work, feedback:Lin Jen-Shin2016-11-151-1/+1
| * | | | | | | | | | | @ref might not existLin Jen-Shin2016-11-151-1/+1