Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | adds hover titles to merge request and issue pageshover-descriptions | Jacob Schatz | 2016-01-11 | 1 | -5/+9 |
* | Merge branch 'rs-omniauth-client-versions' into 'master' | Dmitriy Zaporozhets | 2016-01-11 | 2 | -4/+4 |
|\ | |||||
| * | Add versions to omniauth_crowd and omniauth-azure-oauth2rs-omniauth-client-versions | Robert Speicher | 2016-01-10 | 2 | -4/+4 |
* | | Merge branch 'group-issues-sorting' into 'master' | Dmitriy Zaporozhets | 2016-01-11 | 8 | -13/+23 |
|\ \ | |||||
| * | | Removed ORDER BY in "of_group" scopesgroup-issues-sorting | Yorick Peterse | 2016-01-07 | 2 | -2/+4 |
| * | | Fixed issue sorting specs for ID changes | Yorick Peterse | 2016-01-07 | 1 | -6/+6 |
| * | | Updated Gemfile.lock due to Bundler re-ordering | Yorick Peterse | 2016-01-07 | 1 | -5/+5 |
| * | | Drop projects order in IssuableFinder | Yorick Peterse | 2016-01-07 | 1 | -2/+2 |
| * | | Don't pluck IDs when getting issues/MRs per group | Yorick Peterse | 2016-01-07 | 2 | -2/+2 |
| * | | Sort by ID when sorting using "Recently created" | Yorick Peterse | 2016-01-07 | 3 | -3/+6 |
| * | | Added an index on milestones.title | Yorick Peterse | 2016-01-07 | 1 | -0/+5 |
* | | | Merge branch 'rs-woff-fonts' into 'master' | Dmitriy Zaporozhets | 2016-01-11 | 32 | -7/+8 |
|\ \ \ | |||||
| * | | | Use WOFF versions of SourceSansPrors-woff-fonts | Robert Speicher | 2016-01-09 | 32 | -7/+8 |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2016-01-11 | 5 | -128/+119 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'rs-zenmode-cleanup' into 'master' | Douwe Maan | 2016-01-11 | 5 | -128/+119 |
| |\ \ \ \ | |||||
| | * | | | | Refactor ZenModers-zenmode-cleanup | Robert Speicher | 2016-01-08 | 5 | -128/+119 |
* | | | | | | Merge pull request #9960 from huacnlee/fix/do-not-use-coffeescript-in-erb | Douwe Maan | 2016-01-11 | 3 | -22/+24 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | use JavaScript instead of CoffeeScript in Views, the reason #9819 | Jason Lee | 2016-01-11 | 3 | -22/+24 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'fix-build-status-caching' into 'master' | Dmitriy Zaporozhets | 2016-01-11 | 2 | -5/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Fix caching issue where build status was not updating in project dashboard | Stan Hu | 2016-01-08 | 2 | -5/+9 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'load-autocomplete-when-needed' into 'master' | Dmitriy Zaporozhets | 2016-01-11 | 2 | -12/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Only load autocomplete data when actually needed | Yorick Peterse | 2016-01-11 | 2 | -12/+15 |
* | | | | | | Merge branch 'fix-build-page-typo' into 'master' | Kamil Trzciński | 2016-01-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix typo in build page of projects | Steffen Köhler | 2016-01-10 | 1 | -1/+1 |
* | | | | | | | Merge branch 'doc-update' into 'master' | Achilleas Pipinellis | 2016-01-11 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Update docs for shared runner default settings | Luke Waite | 2016-01-10 | 1 | -2/+3 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'autocomplete-on-load' into 'master' | Dmitriy Zaporozhets | 2016-01-11 | 1 | -13/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Load autocomplete data when loading an issue pageautocomplete-on-load | Yorick Peterse | 2016-01-08 | 1 | -13/+12 |
* | | | | | | | Merge branch 'new-branch-position-fix' into 'master' | Dmitriy Zaporozhets | 2016-01-11 | 2 | -2/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fixes new branch button positioning, when visible and not visible containernew-branch-position-fix | Jacob Schatz | 2016-01-08 | 2 | -2/+7 |
* | | | | | | | | Merge branch 'add-pencil-icon-to-group-page' into 'master' | Dmitriy Zaporozhets | 2016-01-11 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Check for current user | Stan Hu | 2016-01-10 | 1 | -1/+2 |
| * | | | | | | | | Add pencil icon to edit group settings | Stan Hu | 2016-01-10 | 1 | -3/+5 |
* | | | | | | | | | Merge branch 'fix-duplicate-branch-activity' of https://gitlab.com/stanhu/git... | Dmitriy Zaporozhets | 2016-01-11 | 3 | -2/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix duplicated branch creation/deletion events when using Web UI | Stan Hu | 2016-01-08 | 3 | -2/+1 |
* | | | | | | | | | | Merge branch 'master' into 'master' | Jeroen Nijhof | 2016-01-11 | 7 | -2/+58 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge gitlab.com:gitlab-org/gitlab-ce | Jeroen Nijhof | 2016-01-11 | 41 | -78/+258 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'Issue#5817' into 'master' | Stan Hu | 2016-01-11 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Issue #5817 wording of the web hooks updated on issue and merge events | iqualisoni | 2016-01-11 | 2 | -4/+4 |
* | | | | | | | | | | | Merge branch 'check-for-present-runner-token' into 'master' | Stan Hu | 2016-01-11 | 4 | -5/+31 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Before project save ensure that a runners_token exists | Stan Hu | 2016-01-10 | 2 | -1/+2 |
| * | | | | | | | | | | Fix Error 500 when visiting build page of project with nil runners_token | Stan Hu | 2016-01-10 | 4 | -5/+30 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Remove outdated gitlab-git-http-server reference from Install doc | Robert Speicher | 2016-01-10 | 1 | -2/+2 |
* | | | | | | | | | | Merge branch 'fix_jira_shortterm' into 'master' | Robert Speicher | 2016-01-10 | 2 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Do not call API if there is no API URL | Drew Blessing | 2016-01-07 | 2 | -0/+4 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'update-changelog-with-email-reply-fix' into 'master' | Robert Speicher | 2016-01-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add CHANGELOG entry for reply-by-email fix | Stan Hu | 2016-01-09 | 1 | -0/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'disable-blocked-in-abuse-reports' into 'master' | Robert Speicher | 2016-01-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Disable "Already Blocked" button in admin abuse report page | Stan Hu | 2016-01-09 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'doc_clean_up_add_users' into 'master' | Achilleas Pipinellis | 2016-01-09 | 14 | -13/+77 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | |