summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '28385-27189-tech-debt-dropdown' into 'master' Fatih Acet2017-03-131-1/+1
|\
| * Simplify selector28385-27189-tech-debt-dropdownFilipa Lacerda2017-03-101-1/+1
* | Merge branch 'refactor/global-permissions-for-internal-users' into 'master' Sean McGivern2017-03-1311-31/+67
|\ \
| * | allow internal attributes to have a nil valuerefactor/global-permissions-for-internal-usershttp://jneen.net/2017-03-101-1/+1
| * | mark internal users in the admin panelhttp://jneen.net/2017-03-091-1/+3
| * | get the logic right :Xhttp://jneen.net/2017-03-091-1/+1
| * | add .internal and .non_internal scopeshttp://jneen.net/2017-03-091-1/+13
| * | consolidate the error handling for #impersonatehttp://jneen.net/2017-03-091-9/+12
| * | use policies to protect sending emailhttp://jneen.net/2017-03-092-1/+2
| * | don't require ghost users to be blockedhttp://jneen.net/2017-03-091-7/+0
| * | don't require passwords for internal usershttp://jneen.net/2017-03-091-1/+8
| * | protect internal users from impersonationhttp://jneen.net/2017-03-091-0/+4
| * | use the policy stack to protect loginshttp://jneen.net/2017-03-093-6/+5
| * | add User#internal? and some global permissionshttp://jneen.net/2017-03-092-1/+10
| * | use a magic default :global symbol instead of nilhttp://jneen.net/2017-03-096-10/+16
* | | Merge branch '24137-issuable-permalink' into 'master' Rémy Coutable2017-03-131-1/+18
|\ \ \
| * | | link issuable reference to itself in headermhasbini2017-03-091-1/+18
* | | | Merge branch 'fix_updated_field_in_atom_files' into 'master' Rémy Coutable2017-03-135-5/+5
|\ \ \ \
| * | | | Fix xml.updated field in rss/atom feedsblackst0ne2017-03-125-5/+5
| | |_|/ | |/| |
* | | | Merge branch '29189-discussion-button' into 'master' Filipa Lacerda2017-03-132-15/+13
|\ \ \ \
| * | | | Fix alignment of resolve discussion button29189-discussion-buttonAnnabel Dunstone Gray2017-03-102-15/+13
* | | | | Merge branch 'mrchrisw-update-deploy-key' into 'master' Filipa Lacerda2017-03-131-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix inconsistent deploy key documentation in UImrchrisw-update-deploy-keyChris Wilson2017-03-081-1/+1
* | | | | Merge branch 'add-frequently-used-emojis-back-to-menu' into 'master' Filipa Lacerda2017-03-101-18/+12
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add frequently used emojis back to awards menuadd-frequently-used-emojis-back-to-menuEric Eastwood2017-03-091-18/+12
| | |_|/ | |/| |
* | | | Merge branch '29263-merge-button-color' into 'master' 29326-how-to-vue-architectural-decisionsAnnabel Dunstone Gray2017-03-102-5/+1
|\ \ \ \
| * | | | Consistent button colors for disabled buttons29263-merge-button-colorSimon Knox2017-03-102-5/+1
* | | | | Merge branch '29137-bulk-perform-async-should-specify-queue' into 'master' Douwe Maan2017-03-101-1/+1
|\ \ \ \ \
| * | | | | adds queue option to push bulk in authorized projects worker29137-bulk-perform-async-should-specify-queueTiago Botelho2017-03-101-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'adam-prevent-two-issue-trackers' into 'master' Sean McGivern2017-03-102-1/+13
|\ \ \ \ \
| * | | | | Prevent more than one issue tracker to be active for the same projectLuis Del Giudice2017-03-102-1/+13
* | | | | | Merge branch '29316-can-t-select-a-mirror-user' into 'master' Sean McGivern2017-03-101-2/+1
|\ \ \ \ \ \
| * | | | | | Fix autocomplete in EE when permissions are sent29316-can-t-select-a-mirror-userSean McGivern2017-03-101-2/+1
* | | | | | | Merge branch '29209-sign-up-form-name' into 'master' Annabel Dunstone Gray2017-03-101-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Change label for name on sign up form29209-sign-up-form-nametauriedavis2017-03-091-1/+1
* | | | | | | Merge branch '24166-close-builds-dropdown' into 'master' Clement Ho2017-03-103-73/+90
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Target all build links inside a dropdown. Use jQuery to handle event delegation.Filipa Lacerda2017-03-092-4/+8
| * | | | | | Use harmony syntax instead of cjsFilipa Lacerda2017-03-091-2/+2
| * | | | | | Uses vanilla JS to listen to click eventFilipa Lacerda2017-03-093-88/+85
| * | | | | | Prevent dropdown from closing when user clicks in a build.Filipa Lacerda2017-03-091-0/+16
* | | | | | | Merge branch 'fix/gb/passed-with-warnings-status-on-mysql' into 'master' Kamil Trzciński2017-03-102-4/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix Rubocop offense in CI/CD stage codefix/gb/passed-with-warnings-status-on-mysqlGrzegorz Bizon2017-03-081-1/+1
| * | | | | | Fix `passed with warnings` stage status on MySQLGrzegorz Bizon2017-03-082-4/+4
* | | | | | | Merge branch '27899-fix-diff-view-comment-form-placement' into 'master'Jacob Schatz2017-03-091-2/+8
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Get view type based on diff_view Cookie27899-fix-diff-view-comment-form-placementAlfredo Sumaran2017-03-081-2/+8
* | | | | | | Merge branch 'convert-data-attr-search-bar' into 'master' Alfredo Sumaran2017-03-091-17/+17
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Convert data attributes in search_bar.html.hamlClement Ho2017-03-091-17/+17
* | | | | | | Order milestone issues by position ascending in apiGeorge Andrinopoulos2017-03-092-1/+3
|/ / / / / /
* | | | | | Merge branch '29048-user-wrap-firefox' into 'master' Clement Ho2017-03-091-2/+2
|\ \ \ \ \ \
| * | | | | | Remove inline-block styling from dropdown avatars29048-user-wrap-firefoxAnnabel Dunstone Gray2017-03-091-2/+2
View Lorry Controller Status