summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/drop-project-authorized-for-user' into 'master' Sean McGivern2016-11-2314-185/+121
|\
| * Update ProjectTeam#fetch_members to use project authorizationsfix/drop-project-authorized-for-userAhmad Sherif2016-11-235-68/+32
| * Update ProjectTeam#max_member_access_for_user_ids to use project authorizationsAhmad Sherif2016-11-234-49/+15
| * Update user's authorized projects if project is allowed to share with groupAhmad Sherif2016-11-232-1/+11
| * Drop Project#authorized_for_user? in favor of ProjectTeam#member?Ahmad Sherif2016-11-237-65/+61
| * Refresh user's authorized projects when one of his memberships are updatedAhmad Sherif2016-11-231-1/+1
| * Change personal projects access level to master in User#project_authorization...Ahmad Sherif2016-11-231-1/+1
| * Use the minimum access level of group link and group member when inserting au...Ahmad Sherif2016-11-231-1/+1
* | Merge branch 'fix-ee_compat_check-when-branch-contains-a-slash' into 'master' Rémy Coutable2016-11-231-2/+6
|\ \ | |/ |/|
| * Ensure we sanitize branch names with path-unfriendly charactersRémy Coutable2016-11-231-2/+6
* | Merge branch 'remove-empty-describe-block' into 'master' Rémy Coutable2016-11-231-3/+0
|\ \
| * | Remove empty describe block in service specSemyon Pupkov2016-11-221-3/+0
* | | Merge branch 'zj-notify-development' into 'master' Sean McGivern2016-11-231-1/+1
|\ \ \
| * | | Notify broken master on #development zj-notify-developmentZeger-Jan van de Weg2016-11-181-1/+1
* | | | Merge branch 'dev-issue-24554' into 'master' Sean McGivern2016-11-232-1/+5
|\ \ \ \
| * | | | Edit help text to clarify that tags are annotated.Liz Lam2016-11-212-1/+5
* | | | | Merge branch 'fix/cycle-analytics-plan-issue' into 'master' Douwe Maan2016-11-234-1/+15
|\ \ \ \ \
| * | | | | Fix and relevant spec for plan stage breaking with nil commitsfix/cycle-analytics-plan-issueJames Lopez2016-11-234-1/+15
* | | | | | Merge branch 'status-badge-spacing' into 'master' Fatih Acet2016-11-233-18/+10
|\ \ \ \ \ \
| * | | | | | Fix spacing between icon and word in status badgestatus-badge-spacingAnnabel Dunstone Gray2016-11-223-18/+10
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'eslint-html-report' into 'master' Robert Speicher2016-11-233-3/+24
|\ \ \ \ \ \
| * | | | | | Generate ESLint HTML report (!7374)winniehell2016-11-223-3/+24
* | | | | | | Merge branch 'fix_sidekiq_stats_in_admin_area' into 'master' Robert Speicher2016-11-233-7/+30
|\ \ \ \ \ \ \
| * | | | | | | Fix sidekiq stats in admin areablackst0ne2016-11-233-7/+30
* | | | | | | | Merge branch '24756-clean-up-eslintrc-globals' into 'master' Alfredo Sumaran2016-11-2318-30/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | keep json alphabetized24756-clean-up-eslintrc-globalsMike Greiling2016-11-221-6/+6
| * | | | | | | | add "gon" to list of expected globalsMike Greiling2016-11-221-0/+1
| * | | | | | | | clean up globals exemptions within .eslintrcMike Greiling2016-11-2218-25/+47
* | | | | | | | | Merge branch '24266-afraid-to-press-the-orange-button-on-merge-request-screen...Fatih Acet2016-11-224-5/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use btn-primary for running builds btnAnnabel Dunstone Gray2016-11-221-3/+3
| * | | | | | | | | deleted old changelog entry24266-afraid-to-press-the-orange-button-on-merge-request-screenDimitrie Hoekstra2016-11-221-4/+0
| * | | | | | | | | added proper changelog entryDimitrie Hoekstra2016-11-221-0/+4
| * | | | | | | | | If Build running change accept merge request when build succeeds button from ...Dimitrie Hoekstra2016-11-183-2/+6
* | | | | | | | | | Merge branch '24739-collapsed-build-list-sorting' into 'master' Fatih Acet2016-11-222-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add CHANGELOG entry for !7681Mike Greiling2016-11-221-0/+4
| * | | | | | | | | | sort pipeline graph builds and build groups by nameMike Greiling2016-11-221-1/+1
* | | | | | | | | | | Merge branch '24639-mr-widget-updates' into 'master' Fatih Acet2016-11-222-39/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove view details link from MR widget24639-mr-widget-updatesAnnabel Dunstone Gray2016-11-181-3/+0
| * | | | | | | | | | | Unify all MR widget text colors and background colorsAnnabel Dunstone Gray2016-11-181-36/+1
* | | | | | | | | | | | Merge branch 'mrchrisw/mysql-install' into 'master' Achilleas Pipinellis2016-11-221-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add omnibus rake task. Fix source envmrchrisw/mysql-installChris Wilson2016-08-191-1/+8
* | | | | | | | | | | | | Merge branch 'doc-for-config' into 'master' Achilleas Pipinellis2016-11-221-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update wordings by feedback from:doc-for-configLin Jen-Shin2016-06-231-7/+8
| * | | | | | | | | | | | | Add some clarification for some files under config/*Lin Jen-Shin2016-06-221-0/+21
* | | | | | | | | | | | | | Merge branch 'disable-calendar-deselection' into 'master' Fatih Acet2016-11-223-0/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix deselecting calendar days on contribution graphClement Ho2016-11-043-0/+46
* | | | | | | | | | | | | | | Merge branch '24161-non-intuitive-buttons-for-import-sources-in-administrator...Fatih Acet2016-11-223-8/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Swapped buttons for checkboxes24161-non-intuitive-buttons-for-import-sources-in-administrator-settings-enable-disableLuke "Jared" Bennett2016-11-213-8/+10
* | | | | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-11-221-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'patch-1' of https://gitlab.com/ffittschen/gitlab-ce into patch-1Florian Fittschen2016-10-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status